log mercurial/merge.py @ 3314:ecc1bf27378c

age author description
Tue, 10 Oct 2006 00:41:55 -0500 Matt Mackall merge: unify merge and copy actions