diff options
| author | David Aguilar <davvid@gmail.com> | 2009-05-02 08:57:21 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-09 15:25:22 (GMT) |
| commit | 4481ff048df4c86021d783de6f099909495f04ff (patch) | |
| tree | f8eaa802fe3a1738f31eab7063b3b040d6662976 /contrib/completion/git-completion.bash | |
| parent | f01f1099f40f24fe6f7802185340a6fa3a3d4f35 (diff) | |
| download | git-4481ff048df4c86021d783de6f099909495f04ff.zip git-4481ff048df4c86021d783de6f099909495f04ff.tar.gz git-4481ff048df4c86021d783de6f099909495f04ff.tar.bz2 | |
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>
Diffstat (limited to 'contrib/completion/git-completion.bash')
0 files changed, 0 insertions, 0 deletions