diff options
| author | David Aguilar <davvid@gmail.com> | 2013-05-09 02:13:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-09 11:59:39 -0700 |
| commit | e2161bc38514722050b3a9c50a7897c40b6a93cf (patch) | |
| tree | 49ff21667b4712a5ac27e567b95c8aaf6b1c2566 /t/lib-git-p4.sh | |
| parent | b120ef3eac677762427631d5ae7372402a80b837 (diff) | |
| download | git-e2161bc38514722050b3a9c50a7897c40b6a93cf.tar.gz git-e2161bc38514722050b3a9c50a7897c40b6a93cf.tar.xz | |
mergetools/kdiff3: do not use --auto when diffing
The `kdiff3 --auto` help message is, "No GUI if all conflicts are auto-
solvable." This flag was carried over from the original mergetool
commands. diff_cmd() is for two-way comparisons only so remove the
superfluous flag.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/lib-git-p4.sh')
0 files changed, 0 insertions, 0 deletions