Mercurial > hg
view tests/test-issue619 @ 7933:5325596c354c
windows: fix missing import of util.Abort
author | Sune Foldager <cryo@cyanite.org> |
---|---|
date | Thu, 02 Apr 2009 17:09:17 +0200 |
parents | 8808ea7da86b |
children | 4c94b6d0fb1c |
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