Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 02:15:20 -0500] rev 3314
merge: various tidying
update tests to handle corrected output and new workingctx display
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 02:11:59 -0500] rev 3313
context: change workingctx str() from . to <node>+
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 01:43:58 -0500] rev 3312
merge: use contexts in checkunknown and forgetremoved
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 01:16:06 -0500] rev 3311
merge: shortcircuit filemerge for identical files
- use filectx.cmp to compare files
- move merge messages into filemerge
- kill the redundant resolving message
- update tests
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 01:13:03 -0500] rev 3310
context: add cmp for filectxs
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 00:54:00 -0500] rev 3309
merge: pull file copy/move out of filemerge
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 00:41:55 -0500] rev 3308
merge: unify merge and copy actions
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 00:32:30 -0500] rev 3307
merge: swap file and mode args for act()
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 00:22:03 -0500] rev 3306
merge: finish removing nodes from action list
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 00:07:46 -0500] rev 3305
hgweb: add file sizes to manifest browsing