Documentation: describe 'union' low-level merge driver
authorJunio C Hamano <gitster@pobox.com>
Sun, 23 Dec 2007 07:14:59 +0000 (23:14 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 23 Dec 2007 07:14:59 +0000 (23:14 -0800)
commit0e545f7...169e2c260dfb4445203c23cafdfc76ef
treee9863c4...bd66a9207e24ac3b8015e4475ed6bfa9copy hash to clipboard (tree)
parentcc21682...936e40bc2e8886623fd44f55e0674932copy hash to clipboard (diff)
Documentation/git-check-attr.txt
Documentation/git-merge.txt
Documentation/gitattributes.txt