diff doc/hgmerge.1.txt @ 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 345bac2bc4ec
children 63b9d2deed48
line wrap: on
line diff