Mercurial > hg

log mercurial/merge.py @ 2814:0f787997e3c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Tue, 08 Aug 2006 10:35:19 -0500 Matt Mackall Merge: move most tests to the beginning
Tue, 08 Aug 2006 09:26:00 -0500 Matt Mackall Merge: refactor err and failedmerge -> unresolved
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 16:47:06 -0500 Matt Mackall Merge with crew
Thu, 03 Aug 2006 15:24:41 -0500 Matt Mackall Move merge code to its own module
less more | (0) tip