log mercurial/merge.py @ 3377:8c36b33a27c7

age author description
Thu, 12 Oct 2006 14:49:19 -0500 Matt Mackall merge: turn followcopies on by default