diff options
| author |  Charles Bailey <charles@hashpling.org> | 2008-11-13 12:41:14 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-11-14 21:30:55 -0800 |
| commit | 682b451f84c046aa5b082e89e3db62950cb6261a (patch) | |
| tree | fd7864b1814217518df587acfcdbc3c92d4f9d67 /t/t6020-merge-df.sh | |
| parent | Fix some tab/space inconsistencies in git-mergetool.sh (diff) | |
| download | tgif-682b451f84c046aa5b082e89e3db62950cb6261a.tar.xz | |
Add -y/--no-prompt option to mergetool
This option lets git mergetool invoke the conflict resolution program
without waiting for a user prompt each time.
Also added a mergetool.prompt (default true) configuration variable
controlling the same behaviour
Signed-off-by: Charles Bailey <charles@hashpling.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6020-merge-df.sh')
0 files changed, 0 insertions, 0 deletions