[PATCH 0 of 2] pull: updated output messages for branches

[Kevin Berridge]

When you pull in new heads which are NOT on the current branch but are on other branches the messages are somewhat confusing.  The first patch here removes the confusing suggestion to merge.  The second patch adds a slightly modified message for the current branch has multiple heads and there are other branches.

These patches include updates from conversations on the mailing list.