3 Commits

Author	SHA1	Message	Date
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
Patrick Mezard	08be82588e	Merge with crew-stable, fix test output	2008-04-14 23:28:50 +02:00
Dov Feldstern	2451adfa26	test that internal merge tools are used when set for a merge-pattern in hgrc ... It is possible to specify that one of the internal merge tools (internal:fail, internal:local or internal:other) should be used for performing merges on files matching a given pattern. This test makes sure that such a setting actually works.	2008-04-04 02:20:58 +03:00