]> git.ipfire.org Git - thirdparty/git.git/commit - ll-merge.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 191f241) | patch
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)
commit8588567c96490b8d236b1bc13f9bcb0dfa118efe
tree5c5f026346ef69293b14419028f15ecf39d5701dtree | snapshot
parent191f24171718e894cb5ba806bc45861ebac95e96commit | diff
rerere: honor conflict-marker-size attribute

Signed-off-by: Junio C Hamano <gitster@pobox.com>
ll-merge.c diff | blob | blame | history
ll-merge.h diff | blob | blame | history
rerere.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.