mergetool-lib: call vim in readonly mode for diffs
When [g]vimdiff is called for files which are opened already, the editor complains about the existing swap file. But we do not want to write anything when called from difftool. So, make difftool use "-R" for the vim family. This - prevents the use of a swap file and - marks the buffers readonly. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber committed
Feb 25, 2011 at 10:36 UTC
853c0ffe42fef0bd1abd5cc69d5e93fdd5a708aa
1 file changed
+2
-2
git-mergetool--lib.sh
+2
-2
@@ -182,7 +182,7 @@ run_merge_tool () {
182
fi
183
check_unchanged
184
else
185
- "$merge_tool_path" -f -d -c "wincmd l" \
185
+ "$merge_tool_path" -R -f -d -c "wincmd l" \
186
"$LOCAL" "$REMOTE"
187
fi
188
;;
@@ -193,7 +193,7 @@ run_merge_tool () {
193
"$LOCAL" "$MERGED" "$REMOTE"
194
check_unchanged
195
else
196
- "$merge_tool_path" -f -d -c "wincmd l" \
196
+ "$merge_tool_path" -R -f -d -c "wincmd l" \
197
"$LOCAL" "$REMOTE"
198
fi
199
;;