mergetool: document the default for --[no-]prompt
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 Apr 2014 17:07:20 +0000 (10:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 24 Apr 2014 18:29:05 +0000 (11:29 -0700)
commitc15bb0c...d73e4dad52a6d4869a254baf3a689b6a
tree004fe0f...aa644c708a55fc27549f1639a2871deecopy hash to clipboard (tree)
parent4ecc63d...f982aa65038048bcdaf49e99b428b028copy hash to clipboard (diff)
Documentation/git-mergetool.txt