bzr pull should notifiy of outstanding conflicts on a successful pull from trunk

[Emmet Hikory]

When a branch has an outstanding conflict, and bzr pull against trunk may be applied successfully, the user is given the message "All changes applied successfully", and, depending on the type of changes, may end up with a complete lack of conflict markers in the conflicting file, although the foo.BASE, foo.THIS, and foo.OTHER files may still exist from the previous conflict.

When in this state, bzr status correctly informs of the conflict, but if the user does not suspect a conflict, the user may not discover the issue until attempting to commit.

When there is a pending conflict, bzr should provide notification of the form "All changes applied successfully, %d conflicts outstanding" on a successful pull, and "%d conflicts created by this merge, $d previously existing conflicts" when introducing new conflicts (or similar wording: consistency is good).