diff options
| author | Bert Wesarg <bert.wesarg@googlemail.com> | 2010-02-23 20:11:12 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-23 21:11:28 (GMT) |
| commit | 16758621d5a4a78eed7c183b60bf7ebaeaf305c5 (patch) | |
| tree | 62feac3c2529872dd10ca5ab9005e5ff64d6b7a1 /fetch-pack.h | |
| parent | b39c3612eb443e77bd04d645578e1155988c6dde (diff) | |
| download | git-16758621d5a4a78eed7c183b60bf7ebaeaf305c5.zip git-16758621d5a4a78eed7c183b60bf7ebaeaf305c5.tar.gz git-16758621d5a4a78eed7c183b60bf7ebaeaf305c5.tar.bz2 | |
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 'fetch-pack.h')
0 files changed, 0 insertions, 0 deletions