]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ca8e6b7) | patch
mergetool: avoid misleading message "Resetting to default..."
authorSteffen Prohaska <prohaska@zib.de>
Thu, 18 Oct 2007 10:25:34 +0000 (12:25 +0200)
committerShawn O. Pearce <spearce@spearce.org>
Thu, 18 Oct 2007 23:59:58 +0000 (19:59 -0400)
commitd279fc1a76bf9bfeedded1a1c8ebcfc8779f5b10
tree9babddc79be1a1b796648945d235137f0a0ceab0tree | snapshot
parentca8e6b7a55bfeccbd08182205102d44874f787b6commit | diff
mergetool: avoid misleading message "Resetting to default..."

If no mergetool is configured in the configuration variable
merge.tool the resetting message should not be printed.

This is fixed. The message is only printed if a tool is configured
but the entry in merge.tool is invalid.

Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
git-mergetool.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.