log mercurial/hg.py @ 273:4f8174389001

age author description
Tue, 07 Jun 2005 19:00:56 -0800 mpm merge: Fix bug where we overwrote local when local was newer