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>
Bert Wesarg committed
Feb 23, 2010 at 21:11 UTC
16758621d5a4a78eed7c183b60bf7ebaeaf305c5
1 file changed
+2
-1
Documentation/gitattributes.txt
+2
-1
@@ -511,7 +511,8 @@ command to run to merge ancestor's version (`%O`), current
511
version (`%A`) and the other branches' version (`%B`). These
512
three tokens are replaced with the names of temporary files that
513
hold the contents of these versions when the command line is
514
-built.
514
+built. Additionally, %L will be replaced with the conflict marker
515
+size (see below).
516
517
The merge driver is expected to leave the result of the merge in
518
the file named with `%A` by overwriting it, and exit with zero