Mercurial > hg
view tests/test-issue619 @ 9755:d64bdaeaa2b9
i18n-de: Removed all fuzzies and translated small alphaend-extensions
author | Fabian Kreutz <fabian.kreutz@starnet.fi> |
---|---|
date | Tue, 20 Oct 2009 17:31:09 +0300 |
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