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)
commitd279fc1...76bf9bfeedded1a1c8ebcfc8779f5b10
tree9babddc...9be1a1b796648945d235137f0a0ceab0copy hash to clipboard (tree)
parentca8e6b7...55bfeccbd08182205102d44874f787b6copy hash to clipboard (diff)
git-mergetool.sh