log mercurial/merge.py @ 4959:97b734fb9c6f

age author description
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)