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

Merge branch 'da/mergetool-lib'

Browse Source 
* da/mergetool-lib:
  mergetool--lib: specialize diff options for emerge and ecmerge
This commit is contained in:
Junio C Hamano 2009-05-23 01:41:51 -07:00
commit bbc0995792
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-mergetool--lib.sh
View File

@ -228,8 +228,8 @@ run_merge_tool () {
fi fi
check_unchanged check_unchanged
else else
"$merge_tool_path" "$LOCAL" "$REMOTE" \ "$merge_tool_path" --default --mode=diff2 \
--default --mode=merge2 --to="$MERGED" "$LOCAL" "$REMOTE"
fi fi
;; ;;
emerge) emerge)
@ -248,7 +248,7 @@ run_merge_tool () {
status=$? status=$?
else else
"$merge_tool_path" -f emerge-files-command \ "$merge_tool_path" -f emerge-files-command \
"$LOCAL" "$REMOTE" "$(basename "$MERGED")" "$LOCAL" "$REMOTE"
fi fi
;; ;;
tortoisemerge) tortoisemerge)