![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 Feb 2009 03:40:35 +0000 (19:40 -0800) | ||
| committer | Junio 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
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