projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitb371922aa5b972557cd143461250a9d360882285
tree8cd7e433ae0bf16e890cc909988ab16bb2b0a554tree | snapshot
parent84b96278cc164b748b2c9dbe489f8d7b30bbbc4ecommit | diff
parentff4a18552aa48f3227e2465072951dacc34aee9bcommit | diff
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
git-mergetool.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.