| commit | b371922aa5b972557cd143461250a9d360882285 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 Feb 2009 03:40:35 +0000 (5 19:40 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 Feb 2009 03:40:35 +0000 (5 19:40 -0800) | ||
| tree | 8cd7e433ae0bf16e890cc909988ab16bb2b0a554 | treesnapshot (tar.gz zip) |
| parent | 84b96278cc164b748b2c9dbe489f8d7b30bbbc4e | commitdiff |
| parent | ff4a18552aa48f3227e2465072951dacc34aee9b | commitdiff |
Merge branch 'cb/mergetool'
* 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
* 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
| git-mergetool.sh | diff1 | diff2 | blobhistory |