Mercurial > hg > mercurial-crew-with-dirclash

log mercurial/merge.py @ 2825:1ea086bc2086

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 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