Merge branch 'mm/maint-hint-failed-merge'
authorJunio C Hamano <gitster@pobox.com>
Tue, 24 Nov 2009 06:31:51 +0000 (22:31 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Nov 2009 06:31:51 +0000 (22:31 -0800)
commit444e10d...2a4159b5dd2975feadbb9e1213d65b47
treee0d4c77...5d74c457f063c1b12105cf77cec60daecopy hash to clipboard (tree)
parente61f25f...a6bb5dcbb5ae5f8b4ad26c308982373ccopy hash to clipboard (diff)
parente63ec00...b2a0c89f0c1cbc4862dcef7c4a14a785copy hash to clipboard (diff)
Documentation/config.txt
Documentation/user-manual.txt
merge-recursive.c