projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 23a64c9) | patch
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)
commit191f24171718e894cb5ba806bc45861ebac95e96
tree38f69156182a9c7ec63342e7bda91a4bc45c8ea8tree | snapshot
parent23a64c9e771e3caf19cf2ee9a32c8942ddde4a81commit | diff
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>
rerere.c diff | blob | history
Git—the stupid content tracker