Brendan Cully <brendan@kublai.com> [Mon, 07 Aug 2006 14:48:24 -0700] rev 2817
Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com> [Mon, 07 Aug 2006 14:48:18 -0700] rev 2816
Update qsave to use StatusEntry; don't throw exception on bad status lines.
Matt Mackall <mpm@selenic.com> [Tue, 08 Aug 2006 10:56:48 -0500] rev 2815
Merge: combine force and forcemerge arguments
Matt Mackall <mpm@selenic.com> [Tue, 08 Aug 2006 10:35:19 -0500] rev 2814
Merge: move most tests to the beginning
Matt Mackall <mpm@selenic.com> [Tue, 08 Aug 2006 09:26:00 -0500] rev 2813
Merge: refactor err and failedmerge -> unresolved
Matt Mackall <mpm@selenic.com> [Tue, 08 Aug 2006 09:19:20 -0500] rev 2812
Refactor update locking slightly
Matt Mackall <mpm@selenic.com> [Tue, 08 Aug 2006 09:11:16 -0500] rev 2811
Merge: combine choose and moddirstate to partial
Matt Mackall <mpm@selenic.com> [Mon, 07 Aug 2006 23:53:04 -0500] rev 2810
Rename merge.allow -> merge.branchmerge
Matt Mackall <mpm@selenic.com> [Mon, 07 Aug 2006 23:18:16 -0500] rev 2809
Use demandload @ syntax
Matt Mackall <mpm@selenic.com> [Mon, 07 Aug 2006 22:54:33 -0500] rev 2808
Introduce update helper functions: update, merge, clean, and revert