| commit | 4481ff048df4c86021d783de6f099909495f04ff | |
| author | David Aguilar <davvid@gmail.com> | |
| Sat, 2 May 2009 08:57:21 +0000 (2 01:57 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 9 May 2009 15:25:22 +0000 (9 08:25 -0700) | ||
| tree | f8eaa802fe3a1738f31eab7063b3b040d6662976 | treesnapshot (tar.gz zip) |
| parent | f01f1099f40f24fe6f7802185340a6fa3a3d4f35 | commitdiff |
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>
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>
| git-mergetool--lib.sh | diffblobblamehistory |