More than 5 years have passed since last update.

Use WinMerge inside of Git (git-difftool, git-mergetool)

Last updated at 2012-12-26Posted at 2012-07-22

~/.gitconfig

c.f. http://ptech.g.hatena.ne.jp/noromanba/20120602/1338633091 (written in Japanese)

~/.gitconfig

[merge]
	tool = WinMerge
[mergetool "WinMerge"]
	path = C:/Program Files/WinMerge/WinMergeU.exe
	cmd = \"C:/Program Files/WinMerge/WinMergeU.exe\" /m /r=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
[diff]
	tool = WinMerge
	guitool = WinMerge
[difftool "WinMerge"]
	path = C:/Program Files/WinMerge/WinMergeU.exe
	cmd = \"C:/Program Files/WinMerge/WinMergeU.exe\" -e -ub -dl \"Base\" -dr \"Mine\" \"$LOCAL\" \"$REMOTE\"

How To Use

GitBash

$ git difftool [-y]

GitBash

$ git mergetool [-y]

Environment

OS       | Windows XP SP3
MinGW    | MINGW32_NT-5.1 %COMPUTERNAME% 1.0.12(0.46/3/2) 2011-07-20 17:52 i686 unknown
Git      | git version 1.7.8.msysgit.1
WinMerge | Version 2.13.20.12+-jp-12 - Japanese Unicode x86

:-p

selfish Git Advent Calendar / Jun.

You get articles that match your needs
You can efficiently read back useful information
You can use dark theme

What you can do with signing up