| commit | 4ecc63d7f982aa65038048bcdaf49e99b428b028 | |
| author | Felipe Contreras <felipe.contreras@gmail.com> | |
| Mon, 21 Apr 2014 00:17:34 +0000 (20 19:17 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 22 Apr 2014 19:49:46 +0000 (22 12:49 -0700) | ||
| tree | d16dc5133ac4a9a6fa9b313749d2e32098ab321a | treesnapshot (tar.gz zip) |
| parent | 779792a5f24bb4e8049c4f88ad752e70d4a8a080 | commitdiff |
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>
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>
| git-mergetool.sh | diffblobblamehistory |