* [PATCH] Documentation: mention conflict marker size argument (%L) for merge driver
@ 2010-02-23 20:11 Bert Wesarg
0 siblings, 0 replies; only message in thread
From: Bert Wesarg @ 2010-02-23 20:11 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Bert Wesarg, git
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>
---
Documentation/gitattributes.txt | 3 ++-
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
--
1.7.0.500.ge51cb
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2010-02-23 20:11 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-23 20:11 [PATCH] Documentation: mention conflict marker size argument (%L) for merge driver Bert Wesarg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).