log mercurial/merge.py @ 3202:9e002614f2eb

age author description
Fri, 29 Sep 2006 17:50:59 -0500 Matt Mackall merge: minor nullid cleanup