diff doc/hgmerge.1.txt @ 2528:049f930f18c1

Workaround to work with less sophisticated sed versions. For example NetBSD sed doesn't know about '\|'.
author Sascha Wilde <wilde@sha-bang.de>
date Tue, 27 Jun 2006 21:56:11 +0200
parents 3ab6e55ee361
children 345bac2bc4ec
line wrap: on
line diff