log mercurial/hg.py @ 2830:49988d9f0758

age author description
Wed, 09 Aug 2006 13:55:18 -0500 Matt Mackall Merge with crew, fix most tests
Tue, 08 Aug 2006 10:56:48 -0500 Matt Mackall Merge: combine force and forcemerge arguments
Tue, 08 Aug 2006 09:19:20 -0500 Matt Mackall Refactor update locking slightly
Tue, 08 Aug 2006 09:11:16 -0500 Matt Mackall Merge: combine choose and moddirstate to partial
Mon, 07 Aug 2006 23:53:04 -0500 Matt Mackall Rename merge.allow -> merge.branchmerge
Mon, 07 Aug 2006 23:18:16 -0500 Matt Mackall Use demandload @ syntax
Mon, 07 Aug 2006 22:54:33 -0500 Matt Mackall Introduce update helper functions: update, merge, clean, and revert