log mercurial/hg.py @ 993:6f274afc05c7

age author description
Tue, 23 Aug 2005 02:19:38 -0700 mpm Clean up some merge logic
Mon, 22 Aug 2005 01:22:29 -0700 mpm Fix up some bugs introduced by recent merge changes
Sun, 21 Aug 2005 22:03:36 -0700 mpm merge: remove remaining mark bits