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>
maint
Bert Wesarg
15 years ago
committed by
Junio C Hamano
1 changed files with 2 additions and 1 deletions
Loading…
Reference in new issue