projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 84b9627 ff4a185)
Merge branch 'cb/mergetool'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Feb 2009 03:40:35 +0000 (19:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Feb 2009 03:40:35 +0000 (19:40 -0800)
* cb/mergetool:
  mergetool: fix running mergetool in sub-directories
  mergetool: Add a test for running mergetool in a sub-directory
  mergetool: respect autocrlf by using checkout-index

1  2 
git-mergetool.sh patch | diff1 | diff2 | blob | history

diff --cc git-mergetool.sh
Simple merge
Git—the stupid content tracker