| commit | 8588567c96490b8d236b1bc13f9bcb0dfa118efe | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 17 Jan 2010 07:28:46 +0000 (16 23:28 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 17 Jan 2010 10:01:43 +0000 (17 02:01 -0800) | ||
| tree | 5c5f026346ef69293b14419028f15ecf39d5701d | treesnapshot (tar.gz zip) |
| parent | 191f24171718e894cb5ba806bc45861ebac95e96 | commitdiff |
rerere: honor conflict-marker-size attribute
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| ll-merge.c | diffblobblamehistory | |
| ll-merge.h | diffblobblamehistory | |
| rerere.c | diffblobblamehistory |