Charles Bailey wrote:
> ---
> git-mergetool.sh | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/git-mergetool.sh b/git-mergetool.sh
> index aefdca7..d495a6b 100755
> --- a/git-mergetool.sh
> +++ b/git-mergetool.sh
> @@ -131,7 +131,7 @@ checkout_staged_file () {
> tmpfile=$(expr "$(git checkout-index --temp --stage="$1" "$2")" : '\([^ ]*\) ')
>
> if test $? -eq 0 -a -n "$tmpfile" ; then
> - mv -- "$tmpfile" "$3"
> + mv -- "$(git rev-parse --show-cdup)$tmpfile" "$3"
> fi
> }
>
> @@ -161,9 +161,9 @@ merge_file () {
> local_mode=`git ls-files -u -- "$MERGED" | awk '{if ($3==2) print $1;}'`
> remote_mode=`git ls-files -u -- "$MERGED" | awk '{if ($3==3) print $1;}'`
>
> - base_present && checkout_staged_file 1 "$prefix$MERGED" "$BASE"
> - local_present && checkout_staged_file 2 "$prefix$MERGED" "$LOCAL"
> - remote_present && checkout_staged_file 3 "$prefix$MERGED" "$REMOTE"
> + base_present && checkout_staged_file 1 "$MERGED" "$BASE"
> + local_present && checkout_staged_file 2 "$MERGED" "$LOCAL"
> + remote_present && checkout_staged_file 3 "$MERGED" "$REMOTE"
>
> if test -z "$local_mode" -o -z "$remote_mode"; then
> echo "Deleted merge conflict for '$MERGED':"
Yes, I was just about to propose a similar patch.
This solution works for me!
You might want to remove $prefix from the top of the
file since it's not used any more.
Thanks!
// Jonas
--
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
