diff hgmerge @ 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 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff