tests/test-symlink-addremove.out

prepush: add more precise error messages

Part of the patch is from [e-mail]

- indicate the branch name where there are multiple heads
- give better advice when hitting a possible race, where new heads are added
  between discovery and the call to branchmap(). In that case, asking the user
  to merge isn't helpful, since only remote has the changes.

% directory moved and symlinked
adding foo/a
% now addremove should remove old files
adding bar/a
adding foo
removing foo/a