Skip to content

Instantly share code, notes, and snippets.

@milnak
Created November 12, 2024 23:06
Show Gist options
  • Save milnak/2071553f73565be62708311581e22cda to your computer and use it in GitHub Desktop.
Save milnak/2071553f73565be62708311581e22cda to your computer and use it in GitHub Desktop.
Git config settings for WinMerge
# Install WinMerge per-user from https://winmerge.org/downloads
# or: winget install --id 'WinMerge.WinMerge'
# Then do "git config --edit --global" and add the following:
[diff]
tool = winmerge
[difftool "winmerge"]
name = WinMerge
trustExitCode = true
# For Machine-wide install:
# cmd = \"C:/Program Files/WinMerge/WinMergeU.exe\" -sw -u -e $LOCAL $REMOTE
# path = \"C:/Program Files/WinMerge\"
cmd = ~/AppData/Local/Programs/WinMerge/WinMergeU.exe -sw -u -e $LOCAL $REMOTE
path = ~/AppData/Local/Programs/WinMerge
[merge]
tool = winmerge
[mergetool]
prompt = false
keepBackup = false
keepTemporaries = false
[mergetool "winmerge"]
name = WinMerge
trustExitCode = true
# For Machine-wide install:
# cmd = \"C:/Program Files/WinMerge/WinMergeU.exe\" -sw -u -e -dl "Local" -dr "Remote" $LOCAL $REMOTE $MERGED
# path = \"C:/Program Files/WinMerge\"
cmd = ~/AppData/Local/Programs/WinMerge/WinMergeU.exe -sw -u -e -dl "Local" -dr "Remote" $LOCAL $REMOTE $MERGED
path = ~/AppData/Local/Programs/WinMerge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment