log mercurial/hg.py @ 90:ab9ebff09dcd

age author description
Tue, 17 May 2005 13:38:21 -0800 mpm Fix manifest merge swap bug
Tue, 17 May 2005 11:40:45 -0800 mpm Fix merge bug, I hope
Tue, 17 May 2005 11:06:59 -0800 mpm Add -q quiet option
Tue, 17 May 2005 01:12:30 -0800 mpm Add basic annotation support
Tue, 17 May 2005 01:07:57 -0800 mpm Add "HG: merge resolve" to editor text for merge
Fri, 13 May 2005 13:12:32 -0800 mpm Add tag support
Fri, 13 May 2005 11:47:16 -0800 mpm Fix up a bunch of bugs in the new merge code 0.4f