diff options
| author |  Felipe Contreras <felipe.contreras@gmail.com> | 2014-04-20 19:17:34 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-04-22 12:49:46 -0700 |
| commit | 4ecc63d7f982aa65038048bcdaf49e99b428b028 (patch) | |
| tree | d16dc5133ac4a9a6fa9b313749d2e32098ab321a /t/t7106-reset-unborn-branch.sh | |
| parent | Update draft release notes to 2.0 (diff) | |
| download | tgif-4ecc63d7f982aa65038048bcdaf49e99b428b028.tar.xz | |
mergetool: run prompt only if guessed tool
It's annoying to see the prompt:
Hit return to start merge resolution tool (foo):
Every time the user does 'git mergetool' even if the user already
configured 'foo' as the wanted tool.
Display this prompt only when the user hasn't explicitly configured a
tool.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Acked-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7106-reset-unborn-branch.sh')
0 files changed, 0 insertions, 0 deletions