log mercurial/hg.py @ 199:2424676edd8c

age author description
Tue, 31 May 2005 08:56:05 -0800 mpm annotate: deal with merges