{"thread":{"id":"22772","subject":"[PATCH] Documentation: mention conflict marker size argument (%L) for merge driver","startedAt":"2010-02-23T20:11:12Z","lastAt":"2010-02-23T20:11:12Z","messageCount":1,"participants":["Bert Wesarg"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"135455","messageId":"1266955872-4795-1-git-send-email-bert.wesarg@googlemail.com","threadId":"22772","inReplyTo":null,"subject":"[PATCH] Documentation: mention conflict marker size argument (%L) for merge driver","fromName":"Bert Wesarg","fromEmail":"bert.wesarg@googlemail.com","sentAt":"2010-02-23T20:11:12Z","receivedAt":"2010-02-23T20:11:12Z","isPatch":true,"sender":{"key":"bert.wesarg@googlemail.com","avatar":"https://avatars.githubusercontent.com/u/111934?v=4"},"body":"23a64c9e (conflict-marker-size: new attribute, 2010-01-16) introduced the\nnew attribute and also pass the conflict marker size as %L to merge driver\ncommands. This documents the substitution.\n\nSigned-off-by: Bert Wesarg <bert.wesarg@googlemail.com>\n---\n Documentation/gitattributes.txt |    3 ++-\n 1 files changed, 2 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt\nindex b396a87..d892e64 100644\n--- a/Documentation/gitattributes.txt\n+++ b/Documentation/gitattributes.txt\n@@ -511,7 +511,8 @@ command to run to merge ancestor's version (`%O`), current\n version (`%A`) and the other branches' version (`%B`).  These\n three tokens are replaced with the names of temporary files that\n hold the contents of these versions when the command line is\n-built.\n+built. Additionally, %L will be replaced with the conflict marker\n+size (see below).\n \n The merge driver is expected to leave the result of the merge in\n the file named with `%A` by overwriting it, and exit with zero\n-- \n1.7.0.500.ge51cb\n"}]}