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)
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
index b396a871b32de52962eaa36f9d6be19d108d88ee..d892e642eded92fd0409e39fc34c005f88bc4a9b 100644 (file)
@@ -511,7 +511,8 @@ command to run to merge ancestor's version (`%O`), current
 version (`%A`) and the other branches' version (`%B`).  These
 three tokens are replaced with the names of temporary files that
 hold the contents of these versions when the command line is
-built.
+built. Additionally, %L will be replaced with the conflict marker
+size (see below).
 
 The merge driver is expected to leave the result of the merge in
 the file named with `%A` by overwriting it, and exit with zero