Skip to content

Instantly share code, notes, and snippets.

@masaru-b-cl

masaru-b-cl/git-mergetool-using-winmerge-settings.txt

Created December 25, 2012 02:41
Show Gist options
  • Star 1 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save masaru-b-cl/4371419 to your computer and use it in GitHub Desktop.
Save masaru-b-cl/4371419 to your computer and use it in GitHub Desktop.
Download ZIP
git mergetoolでWinMergeを使うためのgitconfig設定
Raw
git-mergetool-using-winmerge-settings.txt
[merge]
tool = WinMerge
[mergetool "WinMerge"]
cmd = \"C:/Standalone Programs/WinMerge/WinMergeU.exe\" //r //e //u //wl //wr \"$LOCAL\" \"$BASE\" \"$REMOTE\" //o \"$MERGED\"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment