log mercurial/simplemerge.py @ 13740:dcb51f156fa6

age author description
Fri, 24 Sep 2010 12:46:54 -0500 Matt Mackall backout most of 4f8067c94729