projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 88533f6) | patch
conflict-marker-size: new attribute
authorJunio C Hamano <gitster@pobox.com>
Sat, 16 Jan 2010 06:37:32 +0000 (22:37 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 17 Jan 2010 07:46:12 +0000 (23:46 -0800)
commit23a64c9e771e3caf19cf2ee9a32c8942ddde4a81
tree51ff4ae771d4827c2380eb1f7d9397d09b72ef7atree | snapshot
parent88533f6d64ae898e5f94fa22fa9b5fd43fe3e16ecommit | diff
conflict-marker-size: new attribute

This can be specified to set the length of the conflict marker (usually 7)
to a non-default value per path.  Only the callers of ll_merge() that are
aware of the per-path attributes are modified.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
ll-merge.c diff | blob | history
Git—the stupid content tracker