Junio C Hamano 5c30b8f7dd 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

2009-12-08 22:42:23 -08:00

38 KiB

Raw Blame History

View Raw