Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge3.out @ 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 | 91c56c427171 |
children |