log mercurial/hg.py @ 275:61d45b0ba8fb

age author description
Tue, 07 Jun 2005 20:06:05 -0800 mpm various merge improvements
Tue, 07 Jun 2005 19:00:56 -0800 mpm merge: Fix bug where we overwrote local when local was newer
Sun, 05 Jun 2005 10:50:03 -0800 mpm Fix empty repository transaction bug