Merge branch 'mm/maint-merge-ff-error-message-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 9 Dec 2009 06:42:23 +0000 (22:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 9 Dec 2009 06:42:23 +0000 (22:42 -0800)
commit5c30b8f7dd2640a1b75fcbcdd3e175329c5b7bbe
tree3dd41869a6847564828ec508a356cec213b13a18
parent389e0baa942c4548c5baa60541045b8900113378
parente2ced7de19c85f3b246480bfacdcc934c98c08ca
Merge branch 'mm/maint-merge-ff-error-message-fix' into maint

* mm/maint-merge-ff-error-message-fix:
  builtin-merge: show user-friendly error messages for fast-forward too.
  merge-recursive: make the error-message generation an extern function

Conflicts:
merge-recursive.c
builtin-merge.c
merge-recursive.c