log mercurial/merge.py @ 3006:87a0332ab58b

age author description
Tue, 22 Aug 2006 18:06:17 -0500 Matt Mackall merge: combine merge and get lists