mergetool--lib: specialize diff options for emerge and ecmerge
The ecmerge documentation mentions the following form: ecmerge --mode=diff2 $1 $2 Since git-difftool is about diffing, we should use that instead of --mode=merge2. Likewise, this drops the $MERGED argument to emerge, as discussed on the git list ($gmane/117930). Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
David Aguilar committed
May 2, 2009 at 01:57 UTC
4481ff048df4c86021d783de6f099909495f04ff
1 file changed
+3
-3
git-mergetool--lib.sh
+3
-3
@@ -228,8 +228,8 @@ run_merge_tool () {
228
fi
229
check_unchanged
230
else
231
- "$merge_tool_path" "$LOCAL" "$REMOTE" \
232
- --default --mode=merge2 --to="$MERGED"
231
+ "$merge_tool_path" --default --mode=diff2 \
232
+ "$LOCAL" "$REMOTE"
233
fi
234
;;
235
emerge)
@@ -248,7 +248,7 @@ run_merge_tool () {
248
status=$?
249
else
250
"$merge_tool_path" -f emerge-files-command \
251
- "$LOCAL" "$REMOTE" "$(basename "$MERGED")"
251
+ "$LOCAL" "$REMOTE"
252
fi
253
;;
254
tortoisemerge)