15
Help us understand the problem. What are the problem?

More than 5 years have passed since last update.

posted at

updated at

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

~/.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.

Why not register and get more from Qiita?
  1. We will deliver articles that match you
    By following users and tags, you can catch up information on technical fields that you are interested in as a whole
  2. you can read useful information later efficiently
    By "stocking" the articles you like, you can search right away
15
Help us understand the problem. What are the problem?