Andrew's git / gitweb.git / diff
?
Merge branch 'mm/maint-merge-ff-error-message-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Nov 2009 22:45:08 +0000 (14:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Nov 2009 22:45:08 +0000 (14:45 -0800)
Conflicts:
merge-recursive.c

No differences found