[PATCH 0 of 2 STABLE] Improve merge error detection and reporting

[Greg Ward]

Finally got around to implementing the ideas from a small bikeshedding
session a few weeks ago.

To consider:

1) do I really need a separate script for testing merge errors?
2) is this stable enough for stable?

Greg