diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-01-16 23:28:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-17 02:01:43 -0800 |
| commit | 8588567c96490b8d236b1bc13f9bcb0dfa118efe (patch) | |
| tree | 5c5f026346ef69293b14419028f15ecf39d5701d /builtin-merge-base.c | |
| parent | rerere: prepare for customizable conflict marker length (diff) | |
| download | tgif-8588567c96490b8d236b1bc13f9bcb0dfa118efe.tar.xz | |
rerere: honor conflict-marker-size attribute
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-base.c')
0 files changed, 0 insertions, 0 deletions