Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-issue619 @ 5048:8db8e1100f3f
Update asciidoc instructions to suggest html4 for newer versions
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Wed, 01 Aug 2007 14:32:05 -0700 |
parents | 8808ea7da86b |
children |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init echo a > a hg ci -Ama -d '1000000000 0' echo b > b hg branch b hg ci -Amb -d '1000000000 0' hg co -C 0 echo fast-forward hg merge b hg ci -Ammerge -d '1000000000 0' echo bogus fast-forward should fail hg merge b echo done