"Kelvie Wong" <kelvie@xxxxxxxx> writes:
>> > It _could_ be just the matter of doing this, although I cannot
>> > test it right now (at work and have no access to any of the
>> > backends). Care to try it from a subdirectory and report
>> > failure or success?
Actually, it seems that mergetool can take paths arguments, and
they need to be adjusted, so here is a fixed patch.
---
git-mergetool.sh | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/git-mergetool.sh b/git-mergetool.sh
index a0e44f7..56ec993 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -12,6 +12,8 @@ USAGE='[--tool=tool] [file to merge] ...'
SUBDIRECTORY_OK=Yes
. git-sh-setup
require_work_tree
+directory_prefix=$(git rev-parse --show-prefix)
+cd_to_toplevel
# Returns true if the mode reflects a symlink
is_symlink () {
@@ -378,7 +380,7 @@ if test $# -eq 0 ; then
else
while test $# -gt 0; do
printf "\n"
- merge_file "$1"
+ merge_file "$directory_prefix$1"
shift
done
fi
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
