Bert Wesarg committed 1675862

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 <>

  • Participants
  • Parent commits b39c361

Comments (0)

Files changed (1)

File Documentation/gitattributes.txt

 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. 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