Charles Bailey ff4a18552a 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>

2009-01-31 10:28:33 -08:00

2.9 KiB

Executable File

Raw Blame History

View Raw