Merge branch 'da/mergetool-docs'
authorJunio C Hamano <gitster@pobox.com>
Thu, 7 Feb 2013 22:42:08 +0000 (14:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 7 Feb 2013 22:42:16 +0000 (14:42 -0800)
commit39ca1bd...8256ea482305b7e0acc943ef14e4b36d
tree263d715...9f62be9995ecba9979c26ae10523ef41copy hash to clipboard (tree)
parenteeaf4e7...32f09ef9daa45f9d5ff4713aad9b7d8ecopy hash to clipboard (diff)
parentf35ec54...008e8390e0fd8e545680e72fae0efa35copy hash to clipboard (diff)
Documentation/Makefile
Documentation/diff-config.txt
Documentation/merge-config.txt