builtin-merge: show user-friendly error messages for fast-forward too.