Issue #108 new

When I do an "hg pull -u" I get a message to merge, this is misleading

akbloom
created an issue

The default error message claims a "merge" is necessary. This is incredibly misleading and has caused me serious headaches and pain. Can the message be updated to hint at something more appropriate?