log mercurial/hg.py @ 768:20e95c245bc3

age author description
Sat, 23 Jul 2005 10:00:56 -0500 mpm Fix local file changes being ignored after non-branch merge