log mercurial/merge.py @ 3005:c67920d78248

age author description
Tue, 22 Aug 2006 17:42:55 -0500 Matt Mackall merge: remove redundant if