diff options
| author |  David Aguilar <davvid@gmail.com> | 2009-04-07 01:21:22 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-04-07 22:19:56 -0700 |
| commit | a904392eaeee1629c0ac14dae8e579bb8497636a (patch) | |
| tree | feaacf73a572e72cb424b7691ef37a89d2a214cf /ll-merge.c | |
| parent | difftool: add various git-difftool tests (diff) | |
| download | tgif-a904392eaeee1629c0ac14dae8e579bb8497636a.tar.xz | |
difftool: add support for a difftool.prompt config variable
difftool now supports difftool.prompt so that users do not have to
pass --no-prompt or hit enter each time a diff tool is launched.
The --prompt flag overrides the configuration variable.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions