log mercurial/merge.py @ 3015:db3f42261452

age author description
Sat, 26 Aug 2006 11:19:00 +0200 Benoit Boissinot fix errors reported by pychecker