Merge branch 'ap/maint-merge-strategy-list-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Dec 2009 21:54:11 +0000 (13:54 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Dec 2009 21:54:11 +0000 (13:54 -0800)
commit99292c6...8a5c011ce453c904357185d9f6c7dd62
tree104fca7...1d5078b3b41f1ecc38951aa34ef4dcf5copy hash to clipboard (tree)
parent78b77c4...1ff21e27dbaf1381268aeb380f0607b8copy hash to clipboard (diff)
parented87465...58c83a5a1617920e7b605bd830a78aedcopy hash to clipboard (diff)
builtin-merge.c