[Merge] Suggest pull when asked to merge into an empty branch

[Henry Ludemann]

> From: John Arbash Meinel <john at arbash-meinel.com>
> 
> What about this patch instead. Rather than checking early it just does
> the check at the same time as the existing check. It just changes the
> error message.

Yep, works fine for me.