global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-02 13:00:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'origin/tortoisemerge' into devel

Browse Source
This commit is contained in:
Johannes Schindelin
2009-04-07 18:50:16 +02:00
parent 064f4d6929 57d8748214
commit 7eaf89fd20
4 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/difftool/git-difftool-helper
View File

@@ -86,11 +86,11 @@ launch_merge_tool () {
;;
vimdiff)
"$merge_tool_path" -c "wincmd l" "$LOCAL" "$REMOTE"
"$merge_tool_path" -d -c "wincmd l" "$LOCAL" "$REMOTE"
;;
gvimdiff)
"$merge_tool_path" -c "wincmd l" -f "$LOCAL" "$REMOTE"
"$merge_tool_path" -d -c "wincmd l" -f "$LOCAL" "$REMOTE"
;;
xxdiff)
@@ -160,6 +160,12 @@ init_merge_tool_path() {
merge_tool_path=$(git config mergetool."$1".path)
if test -z "$merge_tool_path"; then
case "$1" in
vimdiff)
merge_tool_path=vim
;;
gvimdiff)
merge_tool_path=gvim
;;
emerge)
merge_tool_path=emacs
;;