log mercurial/merge.py @ 3597:0d253ec988a6

age author description
Tue, 31 Oct 2006 13:03:23 +0100 Benoit Boissinot merge with backout