projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 26b2800) | patch
Mergetool generating blank files (1.5.3)
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Sep 2007 21:41:23 +0000 (14:41 -0700)
committerTheodore Ts'o <tytso@mit.edu>
Sat, 29 Sep 2007 00:13:14 +0000 (20:13 -0400)
commit769f39861b73a374f116fcb913e5ff276fe92751
treec4adbc44e960d041fefdd4c40c167718849b77ebtree | snapshot
parent26b28007689d27a921ea90e5a29fc8eb74b0d297commit | diff
Mergetool generating blank files (1.5.3)

When mergetool is run from a subdirectory, "ls-files -u" nicely
limits the output to conflicted files in that directory, but
we need to give the full path to cat-file plumbing to grab the
contents of stages.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
git-mergetool.sh diff | blob | history
Git—the stupid content tracker