3 Commits

Author	SHA1	Message	Date
Stuart W Marks	928c430865	hg: say 'hg update' instead of 'hg up' in merge status message ... Includes the change to the message itself, along with several test output files that also had to change.	2009-09-17 22:39:38 -07:00
Augie Fackler	bf90b0cbb4	merge: better error messages to lead users to hg update --clean to abandon merges. ... Fixes issue1533.	2009-03-04 13:06:16 -06:00
Stefano Tortarolo	61967725af	make commit fail when committing unresolved files	2008-08-13 20:18:40 -05:00