diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-16 06:37:32 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-17 07:46:12 (GMT) |
| commit | 23a64c9e771e3caf19cf2ee9a32c8942ddde4a81 (patch) | |
| tree | 51ff4ae771d4827c2380eb1f7d9397d09b72ef7a /git-merge-octopus.sh | |
| parent | 88533f6d64ae898e5f94fa22fa9b5fd43fe3e16e (diff) | |
| download | git-23a64c9e771e3caf19cf2ee9a32c8942ddde4a81.zip git-23a64c9e771e3caf19cf2ee9a32c8942ddde4a81.tar.gz git-23a64c9e771e3caf19cf2ee9a32c8942ddde4a81.tar.bz2 | |
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>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions