6 Commits

Author	SHA1	Message	Date
Mads Kiilerich	fae32dd0a3	comments: describe ancestor consistently - avoid 'least common ancestor' ... "best" is as defined by mercurial.ancestor.ancestors: furthest from a root (as measured by longest path).	2014-08-19 01:13:10 +02:00
Matt Mackall	a968007692	merge with stable	2011-12-08 16:01:44 -06:00
Matt Mackall	a69962e18c	branch: warn on branching	2011-12-08 14:32:44 -06:00
Kevin Bullock	4b1f198355	merge: make 'nothing to merge' aborts consistent ... Makes the 'nothing to merge' abort messages in commands.py consistent with those in merge.py. Also makes commands.merge() and merge.update() use hints. The tests show the changes.	2011-12-07 11:23:01 -06:00
Matt Mackall	08439e0f2d	tests: add exit codes to unified tests	2010-09-16 17:51:32 -05:00
Adrian Buehlmann	278c3f123f	tests: unify test-merge-default	2010-09-11 11:44:53 +02:00