rerere: prepare for customizable conflict marker length
authorJunio C Hamano <gitster@pobox.com>
Sun, 17 Jan 2010 07:06:45 +0000 (23:06 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 17 Jan 2010 10:01:34 +0000 (02:01 -0800)
commit191f241...1718e894cb5ba806bc45861ebac95e96
tree38f6915...182a9c7ec63342e7bda91a4bc45c8ea8copy hash to clipboard (tree)
parent23a64c9...771e3caf19cf2ee9a32c8942ddde4a81copy hash to clipboard (diff)
rerere.c