[PATCH] merge: give clearer error messages when there is nothing to merge
Matt Mackall
mpm at selenic.com
Tue Jun 15 22:09:20 UTC 2010
On Mon, 2010-06-14 at 14:45 -0400, Greg Ward wrote:
> @@ -6,5 +6,6 @@
> 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
> (branch merge, don't forget to commit)
> bogus fast-forward should fail
> -abort: can't merge with ancestor
> +abort: nothing to merge
> +(attempt to merge with an ancestor of the working dir)
I'm not sold on this. I think the original message is more to the point.
Also, we generally save "(some text)" for advice on how to deal with an
issue.
--
Mathematics is the supreme nostalgia of our time.
More information about the Mercurial-devel
mailing list