diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-09-27 14:41:23 -0700 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2007-09-28 20:13:14 -0400 |
| commit | 769f39861b73a374f116fcb913e5ff276fe92751 (patch) | |
| tree | c4adbc44e960d041fefdd4c40c167718849b77eb /t/t3030-merge-recursive.sh | |
| parent | 26b28007689d27a921ea90e5a29fc8eb74b0d297 (diff) | |
| download | git-769f39861b73a374f116fcb913e5ff276fe92751.tar.gz | |
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>
Diffstat (limited to 't/t3030-merge-recursive.sh')
0 files changed, 0 insertions, 0 deletions