author | Junio C Hamano <gitster@pobox.com> | |
Fri, 4 Mar 2011 23:02:27 +0000 (15:02 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 4 Mar 2011 23:02:27 +0000 (15:02 -0800) |
* mg/maint-difftool-vim-readonly:
mergetool-lib: call vim in readonly mode for diffs
mergetool-lib: call vim in readonly mode for diffs
git-mergetool--lib.sh | patch | blob | history |
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 77d4aee20ee5b8b01f9a0e3d1f8dbc9f7fdf3eb9..78ce49e9846e908e0d5b262e2a12c2308ed8ac88 100644 (file)
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
fi
check_unchanged
else
- "$merge_tool_path" -f -d -c "wincmd l" \
+ "$merge_tool_path" -R -f -d -c "wincmd l" \
"$LOCAL" "$REMOTE"
fi
;;
"$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
;;