log mercurial/merge.py @ 3313:f009a6f12a59

age author description
Tue, 10 Oct 2006 00:32:30 -0500 Matt Mackall merge: swap file and mode args for act()