| commit | 191f24171718e894cb5ba806bc45861ebac95e96 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 17 Jan 2010 07:06:45 +0000 (16 23:06 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 17 Jan 2010 10:01:34 +0000 (17 02:01 -0800) | ||
| tree | 38f69156182a9c7ec63342e7bda91a4bc45c8ea8 | treesnapshot (tar.gz zip) |
| parent | 23a64c9e771e3caf19cf2ee9a32c8942ddde4a81 | commitdiff |
rerere: prepare for customizable conflict marker length
This still uses the hardcoded conflict marker length of 7 but otherwise
prepares the codepath to deal with customized marker length.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This still uses the hardcoded conflict marker length of 7 but otherwise
prepares the codepath to deal with customized marker length.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| rerere.c | diffblobblamehistory |