Merge branch 'ss/mergetool--lib'

[git.git] / git-mergetool--lib.sh

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index eeefb9c29946fc748e6278d571e7c07e67e144bc..fb3f52ba2507b4fb78db150b5c183f24bd2c57c1 100644 (file)
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -187,7 +187,7 @@ run_merge_tool () {
                        fi
                        check_unchanged
                else
-                       "$merge_tool_path" -f -d -c "wincmd l" \
+                       "$merge_tool_path" -R -f -d -c "wincmd l" \
                                "$LOCAL" "$REMOTE"
                fi
                ;;
@@ -198,7 +198,7 @@ run_merge_tool () {
                                "$LOCAL" "$MERGED" "$REMOTE"
                        check_unchanged
                else
-                       "$merge_tool_path" -f -d -c "wincmd l" \
+                       "$merge_tool_path" -R -f -d -c "wincmd l" \
                                "$LOCAL" "$REMOTE"
                fi
                ;;