| commit | 76ca653842057766773776bffc6a415b39d5a147 | |
| author | David Aguilar <davvid@gmail.com> | |
| Mon, 6 Apr 2009 08:31:19 +0000 (6 01:31 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 8 Apr 2009 05:19:55 +0000 (7 22:19 -0700) | ||
| tree | c1fcbd4fa3c3819f0b3a132048ad92daf74c63c6 | treesnapshot (tar.gz zip) |
| parent | b98c212a9fd97300a8cf39015b8d693f319fd71c | commitdiff |
difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff
We shouldn't try to merge files when using difftool, so remove
any merge-specific options.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
We shouldn't try to merge files when using difftool, so remove
any merge-specific options.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| contrib/difftool/git-difftool-helper | diffblobblamehistory |