9 Commits

Author	SHA1	Message	Date
Patrick Mezard	d458f6f4af	test-imerge: test resolve subcommand	2008-03-23 20:37:04 +01:00
Patrick Mezard	e54f2a771f	imerge: replace "merge" with "internal:merge" when non-interactive	2008-03-23 20:37:02 +01:00
Dirkjan Ochtman	3e3b0d62eb	warn about new heads on commit (issue842)	2008-03-21 11:06:02 +01:00
Matt Mackall	865487e7f2	revlog: report node and file when lookup fails	2008-03-11 17:42:29 -05:00
Joel Rosdahl	9c3f9d4bd6	imerge: Fix unbound name error and add a test case	2008-03-06 22:23:41 +01:00
Benoit Boissinot	513ea49cfc	improve error message for 'hg merge' when repo already at branchtip	2007-08-25 11:30:11 +02:00
Brendan Cully	8b26a09d27	imerge: gussy up dispatcher to support subcommand opts. ... Add -n, --resolved, --unresolved to status.	2007-08-04 12:26:48 -07:00
Brendan Cully	9fa1148786	imerge: handle renames	2007-08-03 18:05:20 -07:00
Brendan Cully	dbb657852c	imerge extension and test	2007-08-01 11:37:11 -07:00