Skip to content

Instantly share code, notes, and snippets.

@pastcompute

pastcompute/gist:ac6f7ff81076d102007ef6997c66c7f6

Created June 5, 2018 13:13
Show Gist options
  • Save pastcompute/ac6f7ff81076d102007ef6997c66c7f6 to your computer and use it in GitHub Desktop.
Save pastcompute/ac6f7ff81076d102007ef6997c66c7f6 to your computer and use it in GitHub Desktop.
Download ZIP
Use winmerge with git on mingw
Raw
gistfile1.txt
git config --global diff.tool winmerge
git config --global difftool.prompt false
git config --global difftool.winmerge.cmd "\"\$PROGRAMFILES (x86)\"/WinMerge/WinMergeU.exe -r -u -e -dl \"Local\" -dr \"Remote\" \"\$LOCAL\" \"\$REMOTE\""
git config --global merge.tool winmerge
git config --global mergetool.prompt false
git config --global mergetool.winmerge.trustExitCode true
git config --global mergetool.winmerge.cmd "\"\$PROGRAMFILES (x86)\"/WinMerge/WinMergeU.exe -r -u -e -dl \"Local\" -dr \"Remote\" \"\$LOCAL\" \"\$REMOTE\" \"\$BASE\" \"\$MERGED\""
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment