diff doc/hgmerge.1.txt @ 3128:15fde1970003

qimport: rename patch to patchname to avoid shadowing module
author Brendan Cully <brendan@kublai.com>
date Tue, 19 Sep 2006 08:45:39 -0700
parents 345bac2bc4ec
children 63b9d2deed48
line wrap: on
line diff