diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-03-04 15:02:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-04 15:02:27 -0800 |
| commit | 08fd8710e277eed73a21c6c5483c57bfeb14e8a7 (patch) | |
| tree | 5d7341cdbf0f7076724615bde742a70b0ad08227 | |
| parent | Merge branch 'jn/maint-commit-missing-template' (diff) | |
| parent | mergetool-lib: call vim in readonly mode for diffs (diff) | |
| download | tgif-08fd8710e277eed73a21c6c5483c57bfeb14e8a7.tar.xz | |
Merge branch 'mg/maint-difftool-vim-readonly'
* mg/maint-difftool-vim-readonly:
mergetool-lib: call vim in readonly mode for diffs
| -rw-r--r-- | git-mergetool--lib.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 77d4aee20e..78ce49e984 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 ;; |