Mercurial > hg > mercurial-crew-with-dirclash

log mercurial/merge.py @ 4961:126f527b3ba3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -100 -30 -10 -7 tip
age author description
Sat, 21 Jul 2007 16:02:10 -0500 Matt Mackall Make repo locks recursive, eliminate all passing of lock/wlock
Sat, 21 Jul 2007 16:02:10 -0500 Matt Mackall Use try/finally pattern to cleanup locks and transactions
Sat, 21 Jul 2007 16:02:09 -0500 Matt Mackall dirstate: break update into separate functions
Sun, 15 Jul 2007 14:43:38 -0500 Matt Mackall merge: fix unnecessary rename merges on linear update (issue631)
Thu, 05 Jul 2007 16:01:07 -0500 Matt Mackall merge: fix adding untracked files on directory rename (issue612)
Thu, 05 Jul 2007 13:34:18 -0500 Matt Mackall merge: make test for fast-forward merge stricter (issue619)
Fri, 22 Jun 2007 20:44:40 -0300 Alexis S. L. Carvalho merge: fix small bug with a failed merge across a rename
less more | (0) -100 -30 -10 -7 tip