diff doc/hgmerge.1.txt @ 3269:6901d3545021

Some versions of sed don't support .\+, so use ..* instead. Reported by Christian Ebert for MacOS X.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 05 Oct 2006 20:03:38 +0200
parents 345bac2bc4ec
children 63b9d2deed48
line wrap: on
line diff