diff mercurial/ancestor.py @ 3313:f009a6f12a59

merge: swap file and mode args for act()
author Matt Mackall <mpm@selenic.com>
date Tue, 10 Oct 2006 00:32:30 -0500
parents b1db258e875c
children eb0b4a2d70a9
line wrap: on
line diff