log mercurial/merge.py @ 3240:8d4855fd9d7b

age author description
Tue, 03 Oct 2006 01:21:46 -0500 Matt Mackall merge: use new working context object in update