| commit | 16758621d5a4a78eed7c183b60bf7ebaeaf305c5 | |
| author | Bert Wesarg <bert.wesarg@googlemail.com> | |
| Tue, 23 Feb 2010 20:11:12 +0000 (23 21:11 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 23 Feb 2010 21:11:28 +0000 (23 13:11 -0800) | ||
| tree | 62feac3c2529872dd10ca5ab9005e5ff64d6b7a1 | treesnapshot (tar.gz zip) |
| parent | b39c3612eb443e77bd04d645578e1155988c6dde | commitdiff |
Documentation: mention conflict marker size argument (%L) for merge driver
23a64c9e (conflict-marker-size: new attribute, 2010-01-16) introduced the
new attribute and also pass the conflict marker size as %L to merge driver
commands. This documents the substitution.
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
23a64c9e (conflict-marker-size: new attribute, 2010-01-16) introduced the
new attribute and also pass the conflict marker size as %L to merge driver
commands. This documents the substitution.
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/gitattributes.txt | diffblobblamehistory |