Code

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)
commit22c4e72d6eef8295a3311f6eb2f82a5494f8b88e
tree8bffa625a10a3e3e0e60db86ea5017565a1d99fd
parent684d0d8dcfa2288744a553fc7294c5f9f5c12026
parented87465658c83a5a1617920e7b605bd830a78aed
Merge branch 'ap/maint-merge-strategy-list-fix'
builtin-merge.c