diff options
| author | Bert Wesarg <bert.wesarg@googlemail.com> | 2010-02-23 23:11:12 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-24 00:11:28 +0300 |
| commit | 16758621d5a4a78eed7c183b60bf7ebaeaf305c5 (patch) | |
| tree | 62feac3c2529872dd10ca5ab9005e5ff64d6b7a1 /test-run-command.c | |
| parent | b39c3612eb443e77bd04d645578e1155988c6dde (diff) | |
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 'test-run-command.c')
0 files changed, 0 insertions, 0 deletions