diff options
| author |  Markus Heidelberg <markus.heidelberg@web.de> | 2009-10-25 01:39:19 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-10-24 17:21:24 -0700 |
| commit | 3319df6f3aa3271124847e2c91c7e6d0be961bc6 (patch) | |
| tree | 925c649097ba2d0c6b68b4b920a857b6d3251ebb /merge-tree.c | |
| parent | Work around option parsing bug in the busybox tar implementation (diff) | |
| download | tgif-3319df6f3aa3271124847e2c91c7e6d0be961bc6.tar.xz | |
t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test
GIT_DIFFTOOL_PROMPT doesn't have any effect if overridden with --prompt.
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions