diff options
| author | David Aguilar <davvid@gmail.com> | 2009-04-06 01:31:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-07 22:19:55 -0700 |
| commit | 76ca653842057766773776bffc6a415b39d5a147 (patch) | |
| tree | c1fcbd4fa3c3819f0b3a132048ad92daf74c63c6 /sha1_file.c | |
| parent | b98c212a9fd97300a8cf39015b8d693f319fd71c (diff) | |
| download | git-76ca653842057766773776bffc6a415b39d5a147.tar.gz git-76ca653842057766773776bffc6a415b39d5a147.tar.xz | |
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>
Diffstat (limited to 'sha1_file.c')
0 files changed, 0 insertions, 0 deletions