diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-16 16:47:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-16 16:47:26 -0700 |
| commit | 13a39e2d865cbc8e1f6d6b71f54b7e4fdfd054a3 (patch) | |
| tree | c876ed9284f86e8eb2ec64c364b6009cab3f871d | |
| parent | c9b7cc04739bd744f7f28742de9ac65a61adebc2 (diff) | |
| parent | 853c0ffe42fef0bd1abd5cc69d5e93fdd5a708aa (diff) | |
| download | git-13a39e2d865cbc8e1f6d6b71f54b7e4fdfd054a3.tar.gz git-13a39e2d865cbc8e1f6d6b71f54b7e4fdfd054a3.tar.xz | |
Merge branch 'mg/maint-difftool-vim-readonly' into maint
* 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 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 ;; |