log mercurial/merge.py @ 4961:126f527b3ba3

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