log mercurial/hg.py @ 187:aa9a0d50e612

age author description
Sat, 28 May 2005 13:59:09 -0800 mpm Fix two minor merge bugs