Add -y/--no-prompt option to mergetool
authorCharles Bailey <charles@hashpling.org>
Thu, 13 Nov 2008 12:41:14 +0000 (12:41 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sat, 15 Nov 2008 05:30:55 +0000 (21:30 -0800)
commit682b451...84c046aa5b082e89e3db62950cb6261a
treefd7864b...814217518df587acfcdbc3c92d4f9d67copy hash to clipboard (tree)
parent0eea345...11a9b9fea4dd2841b80bc7d62964e812copy hash to clipboard (diff)
Documentation/config.txt
Documentation/git-mergetool.txt
git-mergetool.sh