log mercurial/merge.py @ 4652:06de65673ec2

age author description
Tue, 19 Jun 2007 08:51:34 +0200 Thomas Arendsen Hein Updated copyright notices and add "and others" to "hg version"