log mercurial/hg.py @ 764:eea96285cbf9

age author description
Fri, 22 Jul 2005 19:23:00 -0500 mpm Don't mark files with 'm'erge unless we're actually merging branches