diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-01-15 22:37:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-16 23:46:12 -0800 |
| commit | 23a64c9e771e3caf19cf2ee9a32c8942ddde4a81 (patch) | |
| tree | 51ff4ae771d4827c2380eb1f7d9397d09b72ef7a /builtin-ls-files.c | |
| parent | rerere: use ll_merge() instead of using xdl_merge() (diff) | |
| download | tgif-23a64c9e771e3caf19cf2ee9a32c8942ddde4a81.tar.xz | |
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 'builtin-ls-files.c')
0 files changed, 0 insertions, 0 deletions