undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mg/maint-difftool-vim-readonly' into maint

Browse Source 
* mg/maint-difftool-vim-readonly:
  mergetool-lib: call vim in readonly mode for diffs
This commit is contained in:
Junio C Hamano 2011-03-16 16:47:26 -07:00
commit 13a39e2d86
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-mergetool--lib.sh
View File

@ -182,7 +182,7 @@ run_merge_tool () {
fi fi
check_unchanged check_unchanged
else else
"$merge_tool_path" -f -d -c "wincmd l" \ "$merge_tool_path" -R -f -d -c "wincmd l" \
"$LOCAL" "$REMOTE" "$LOCAL" "$REMOTE"
fi fi
;; ;;
@ -193,7 +193,7 @@ run_merge_tool () {
"$LOCAL" "$MERGED" "$REMOTE" "$LOCAL" "$MERGED" "$REMOTE"
check_unchanged check_unchanged
else else
"$merge_tool_path" -f -d -c "wincmd l" \ "$merge_tool_path" -R -f -d -c "wincmd l" \
"$LOCAL" "$REMOTE" "$LOCAL" "$REMOTE"
fi fi
;; ;;