Tue, 10 Oct 2006 02:11:59 -0500 context: change workingctx str() from . to <node>+
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 02:11:59 -0500] rev 3313
context: change workingctx str() from . to <node>+
Tue, 10 Oct 2006 01:43:58 -0500 merge: use contexts in checkunknown and forgetremoved
Matt Mackall <mpm@selenic.com> [Tue, 10 Oct 2006 01:43:58 -0500] rev 3312
merge: use contexts in checkunknown and forgetremoved
Tue, 10 Oct 2006 01:16:06 -0500 merge: shortcircuit filemerge for identical files
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
(0) -3000 -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip