| commit | 769f39861b73a374f116fcb913e5ff276fe92751 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 27 Sep 2007 21:41:23 +0000 (27 14:41 -0700) | ||
| committer | Theodore Ts'o <tytso@mit.edu> | |
| Sat, 29 Sep 2007 00:13:14 +0000 (28 20:13 -0400) | ||
| tree | c4adbc44e960d041fefdd4c40c167718849b77eb | treesnapshot (tar.gz zip) |
| parent | 26b28007689d27a921ea90e5a29fc8eb74b0d297 | commitdiff |
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>
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 | diffblobblamehistory |