diff hgext/extdiff.py @ 2829:4870f795f681

Merge: combine force and forcemerge arguments
author Matt Mackall <mpm@selenic.com>
date Tue, 08 Aug 2006 10:56:48 -0500
parents d99a92b7acad
children 3d6efcbbd1c9
line wrap: on
line diff