diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index a16a2795d70779365212c09b6d0dd42d1746842b..8b5e6a8c64238be2534689113984b7eaf07e94e2 100644 (file)
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
fi
check_unchanged
else
fi
check_unchanged
else
- "$merge_tool_path" "$LOCAL" "$REMOTE" \
- --default --mode=merge2 --to="$MERGED"
+ "$merge_tool_path" --default --mode=diff2 \
+ "$LOCAL" "$REMOTE"
fi
;;
emerge)
fi
;;
emerge)
status=$?
else
"$merge_tool_path" -f emerge-files-command \
status=$?
else
"$merge_tool_path" -f emerge-files-command \
- "$LOCAL" "$REMOTE" "$(basename "$MERGED")"
+ "$LOCAL" "$REMOTE"
fi
;;
tortoisemerge)
fi
;;
tortoisemerge)