[PATCH] merge: give clearer error messages when there is nothing to merge

Matt Mackall mpm at selenic.com
Sat Jun 19 18:11:05 CDT 2010


On Thu, 2010-06-17 at 09:26 -0400, Greg Ward wrote:

>   abort: nothing to merge: requested changeset is already an ancestor
> of the working directory

abort: merging with a working directory ancestor has no effect

?

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list