resolve conflicts

This commit is contained in:
David Refoua
2025-11-09 04:04:28 +03:30
4 changed files with 7 additions and 6 deletions

View File

@@ -27,7 +27,7 @@
.EXAMPLE
.\build.ps1 -SourcesPath '~/custom/vendors.json'
Build cmder with your own packages. See vendor/sources.json for the syntax you need to copy.
Build Cmder with your own packages. See vendor/sources.json for the syntax you need to copy.
.NOTES
AUTHORS
Samuel Vasko, Jack Bennett

View File

@@ -2,18 +2,18 @@
.Synopsis
Pack Cmder
.DESCRIPTION
Use this script to pack cmder into release archives
Use this script to pack Cmder into release archives
You will need to make this script executable by setting your Powershell Execution Policy to Remote signed
Then unblock the script for execution with UnblockFile .\pack.ps1
.EXAMPLE
.\pack.ps1
Creates default archives for cmder
Creates default archives for Cmder
.EXAMPLE
.\pack.ps1 -verbose
Creates default archives for cmder with plenty of information
Creates default archives for Cmder with plenty of information
.NOTES
AUTHORS
Samuel Vasko, Jack Bennett, Martin Kemp

View File

@@ -172,13 +172,13 @@ function Register-Cmder() {
# Text for the context menu item.
$MenuText = "Cmder Here"
, # Defaults to the current cmder directory when run from cmder.
, # Defaults to the current Cmder directory when run from Cmder.
$PathToExe = (Join-Path $env:CMDER_ROOT "cmder.exe")
, # Commands the context menu will execute.
$Command = "%V"
, # Defaults to the icons folder in the cmder package.
, # Defaults to the icons folder in the Cmder package.
$icon = (Split-Path $PathToExe | Join-Path -ChildPath 'icons/cmder.ico')
)
Begin