diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-17 10:28:46 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-17 13:01:43 +0300 |
| commit | 8588567c96490b8d236b1bc13f9bcb0dfa118efe (patch) | |
| tree | 5c5f026346ef69293b14419028f15ecf39d5701d /convert.c | |
| parent | 191f24171718e894cb5ba806bc45861ebac95e96 (diff) | |
rerere: honor conflict-marker-size attribute
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'convert.c')
0 files changed, 0 insertions, 0 deletions