From: Bert Wesarg Date: Tue, 23 Feb 2010 20:11:12 +0000 (+0100) Subject: Documentation: mention conflict marker size argument (%L) for merge driver X-Git-Tag: v1.7.0.1~8 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=16758621d5a4a78eed7c183b60bf7ebaeaf305c5;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index b396a871b..d892e642e 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -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