Mercurial > hg
view tests/test-issue619.out @ 5839:59fba5caa94b
Don't use the -i option with sed
This patch fixes test-keyword on platforms without GNU sed (like
OpenBSD).
author | Will Maier <willmaier@ml1.net> |
---|---|
date | Wed, 09 Jan 2008 10:00:18 -0600 |
parents | 8808ea7da86b |
children | cdc458b12f0f |
line wrap: on
line source
adding a marked working directory as branch b adding b 0 files updated, 0 files merged, 1 files removed, 0 files unresolved fast-forward 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) bogus fast-forward should fail abort: there is nothing to merge, just use 'hg update' or look at 'hg heads' done