mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Documentation: mention conflict marker size argument (%L) for merge driver

Browse Source 
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>
This commit is contained in:
Bert Wesarg
2010-02-23 21:11:12 +01:00
committed by Junio C Hamano
parent b39c3612eb
commit 16758621d5
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/gitattributes.txt
View File

@ -511,7 +511,8 @@ command to run to merge ancestor's version (`%O`), current
version (`%A`) and the other branches' version (`%B`). These version (`%A`) and the other branches' version (`%B`). These
three tokens are replaced with the names of temporary files that three tokens are replaced with the names of temporary files that
hold the contents of these versions when the command line is 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 merge driver is expected to leave the result of the merge in
the file named with `%A` by overwriting it, and exit with zero the file named with `%A` by overwriting it, and exit with zero