Mercurial > hg > mercurial-crew-with-dirclash

log mercurial/merge.py @ 3295:764688cf51e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -30 -10 -7 tip
age author description
Sun, 08 Oct 2006 19:57:45 -0500 Matt Mackall merge: remember rename copies and parents properly on commit
Fri, 06 Oct 2006 16:55:11 -0500 Matt Mackall merge: copy fixes and tests
Wed, 04 Oct 2006 19:08:04 -0500 Matt Mackall merge: fixes for merge+rename
Wed, 04 Oct 2006 15:43:27 -0500 Matt Mackall merge: add rename following
Wed, 04 Oct 2006 14:33:22 -0500 Matt Mackall merge: reduce manifest copying
Wed, 04 Oct 2006 14:09:26 -0500 Matt Mackall merge: reorder dirstate update slightly for correctness
Tue, 03 Oct 2006 01:21:46 -0500 Matt Mackall merge: use new working context object in update
less more | (0) -30 -10 -7 tip