diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-17 08:06:45 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-17 11:01:34 +0100 |
| commit | 191f24171718e894cb5ba806bc45861ebac95e96 (patch) | |
| tree | 38f69156182a9c7ec63342e7bda91a4bc45c8ea8 /ll-merge.h | |
| parent | conflict-marker-size: new attribute (diff) | |
| download | git-191f24171718e894cb5ba806bc45861ebac95e96.tar.xz git-191f24171718e894cb5ba806bc45861ebac95e96.zip | |
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>
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions