Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge4.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 | b2ae81a7df29 |
children |
line wrap: on
line source
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)