git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f01f109)
mergetool--lib: specialize diff options for emerge and ecmerge
authorDavid Aguilar <redacted>
Sat, 2 May 2009 08:57:21 +0000 (01:57 -0700)
committerJunio C Hamano <redacted>
Sat, 9 May 2009 15:25:22 +0000 (08:25 -0700)
commit4481ff048df4c86021d783de6f099909495f04ff
treef8eaa802fe3a1738f31eab7063b3b040d6662976tree | snapshot
parentf01f1099f40f24fe6f7802185340a6fa3a3d4f35commit | diff
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
git-mergetool--lib.sh diff | blob | history
git clone https://git.99rst.org/PROJECT