projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b9b5078) | patch
mergetool: fix running mergetool in sub-directories
authorCharles Bailey <charles@hashpling.org>
Fri, 30 Jan 2009 23:20:11 +0000 (23:20 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sat, 31 Jan 2009 18:28:33 +0000 (10:28 -0800)
commitff4a18552aa48f3227e2465072951dacc34aee9b
tree77bcfdf9d64beab8ffd4ec4702edb65614f8d60ftree | snapshot
parentb9b5078ece4b22c14a36f20bd9dce88d2f350a36commit | diff
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>
git-mergetool.sh diff | blob | history
t/t7610-mergetool.sh diff | blob | history
Git—the stupid content tracker