log mercurial/merge.py @ 21261:6ca05c46aa95

age author description
Thu, 08 May 2014 16:48:28 -0700 Gregory Szorc mergestate: consistently set variables to None