X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-mergetool--lib.sh;h=78ce49e9846e908e0d5b262e2a12c2308ed8ac88;hb=9aec68d3ea935fcb778a3580d950cf20d5bd35f6;hp=77d4aee20ee5b8b01f9a0e3d1f8dbc9f7fdf3eb9;hpb=b720c75afde3d813588fdfc84f762ef947f5587a;p=git.git

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 77d4aee20..78ce49e98 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -182,7 +182,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
 		;;
@@ -193,7 +193,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
 		;;