3 Commits

Author	SHA1	Message	Date
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	010ea362c8	tests: unify test-merge-force	2010-09-11 17:58:37 +02:00