Bert Wesarg 16758621d5 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>

2010-02-23 13:11:28 -08:00

22 KiB

Raw Blame History

View Raw