Documentation: mention conflict marker size argument (%L) for merge driver
authorBert Wesarg <bert.wesarg@googlemail.com>
Tue, 23 Feb 2010 20:11:12 +0000 (21:11 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 23 Feb 2010 21:11:28 +0000 (13:11 -0800)
commit1675862...d5a4a78eed7c183b60bf7ebaeaf305c5
tree62feac3...2529872dd10ca5ab9005e5ff64d6b7a1copy hash to clipboard (tree)
parentb39c361...eb443e77bd04d645578e1155988c6ddecopy hash to clipboard (diff)
Documentation/gitattributes.txt