doc: generate a list of valid merge tools
authorDavid Aguilar <davvid@gmail.com>
Mon, 28 Jan 2013 00:52:26 +0000 (16:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 3 Feb 2013 05:46:52 +0000 (21:46 -0800)
commitf35ec54...008e8390e0fd8e545680e72fae0efa35
treea9877d9...b18e0cb133ff6b861e86aa9b9fb36634copy hash to clipboard (tree)
parent665682c...fd81df7e2dc8fe9db28fa5918a2f8ba0copy hash to clipboard (diff)
Documentation/.gitignore
Documentation/Makefile
Documentation/diff-config.txt
Documentation/merge-config.txt
git-mergetool--lib.sh