Merge branch 'ap/maint-merge-strategy-list-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Nov 2009 22:44:43 +0000 (14:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Nov 2009 22:44:43 +0000 (14:44 -0800)
1  2 
builtin-merge.c

diff --cc builtin-merge.c
Simple merge