summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-16 23:06:45 -0800
committerJunio C Hamano <gitster@pobox.com>2010-01-17 02:01:34 -0800
commit191f24171718e894cb5ba806bc45861ebac95e96 (patch)
tree38f69156182a9c7ec63342e7bda91a4bc45c8ea8 /ll-merge.h
parent23a64c9e771e3caf19cf2ee9a32c8942ddde4a81 (diff)
downloadgit-191f24171718e894cb5ba806bc45861ebac95e96.tar.gz
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