Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-issue619 @ 5416:ca890c0c3f1f
osutil.c: style fix - delete trailing end-of-line spaces
author | Giorgos Keramidas <keramida@ceid.upatras.gr> |
---|---|
date | Sun, 07 Oct 2007 21:56:36 +0300 |
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