Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge7.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 | e506c14382fd |
children | 49988d9f0758 |