Mercurial > hg
view tests/test-issue619 @ 10502:1e022c88a0a5 stable
Add WiX installer scripts to contrib/wix
author | Steve Borho <steve@borho.org> |
---|---|
date | Thu, 18 Feb 2010 13:05:15 -0600 |
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