| commit | ff4a18552aa48f3227e2465072951dacc34aee9b | |
| author | Charles Bailey <charles@hashpling.org> | |
| Fri, 30 Jan 2009 23:20:11 +0000 (30 23:20 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 31 Jan 2009 18:28:33 +0000 (31 10:28 -0800) | ||
| tree | 77bcfdf9d64beab8ffd4ec4702edb65614f8d60f | treesnapshot (tar.gz zip) |
| parent | b9b5078ece4b22c14a36f20bd9dce88d2f350a36 | commitdiff |
mergetool: fix running mergetool in sub-directories
The previous fix to mergetool to use checkout-index instead of cat-file
broke running mergetool anywhere except the root of the repository.
This fixes it by using the correct relative paths for temporary files
and index paths.
Signed-off-by: Charles Bailey <charles@hashpling.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The previous fix to mergetool to use checkout-index instead of cat-file
broke running mergetool anywhere except the root of the repository.
This fixes it by using the correct relative paths for temporary files
and index paths.
Signed-off-by: Charles Bailey <charles@hashpling.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-mergetool.sh | diffblobblamehistory | |
| t/t7610-mergetool.sh | diffblobblamehistory |