summaryrefslogtreecommitdiff
path: root/Documentation/gitattributes.txt
diff options
context:
space:
mode:
authorBert Wesarg <bert.wesarg@googlemail.com>2010-02-23 20:11:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-02-23 21:11:28 (GMT)
commit16758621d5a4a78eed7c183b60bf7ebaeaf305c5 (patch)
tree62feac3c2529872dd10ca5ab9005e5ff64d6b7a1 /Documentation/gitattributes.txt
parentb39c3612eb443e77bd04d645578e1155988c6dde (diff)
downloadgit-16758621d5a4a78eed7c183b60bf7ebaeaf305c5.zip
git-16758621d5a4a78eed7c183b60bf7ebaeaf305c5.tar.gz
git-16758621d5a4a78eed7c183b60bf7ebaeaf305c5.tar.bz2
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>
Diffstat (limited to 'Documentation/gitattributes.txt')
-rw-r--r--Documentation/gitattributes.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index b396a87..d892e64 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