git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 779792a)
mergetool: run prompt only if guessed tool
authorFelipe Contreras <redacted>
Mon, 21 Apr 2014 00:17:34 +0000 (19:17 -0500)
committerJunio C Hamano <redacted>
Tue, 22 Apr 2014 19:49:46 +0000 (12:49 -0700)
commit4ecc63d7f982aa65038048bcdaf49e99b428b028
treed16dc5133ac4a9a6fa9b313749d2e32098ab321atree | snapshot
parent779792a5f24bb4e8049c4f88ad752e70d4a8a080commit | diff
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 <redacted>
Acked-by: David Aguilar <redacted>
Signed-off-by: Junio C Hamano <redacted>
git-mergetool.sh diff | blob | history
git clone https://git.99rst.org/PROJECT