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
Fri, 22 Jul 2005 20:07:14 -0500 mpm Hack to fix missing '/' problem in URLs
Fri, 22 Jul 2005 19:23:00 -0500 mpm Don't mark files with 'm'erge unless we're actually merging branches