rerere: honor conflict-marker-size attribute
authorJunio C Hamano <gitster@pobox.com>
Sun, 17 Jan 2010 07:28:46 +0000 (23:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 17 Jan 2010 10:01:43 +0000 (02:01 -0800)
commit8588567...96490b8d236b1bc13f9bcb0dfa118efe
tree5c5f026...46ef69293b14419028f15ecf39d5701dcopy hash to clipboard (tree)
parent191f241...1718e894cb5ba806bc45861ebac95e96copy hash to clipboard (diff)
ll-merge.c
ll-merge.h
rerere.c