Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-586 @ 4896:ee04732fe61d
merge with crew-stable
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Tue, 17 Jul 2007 09:28:01 -0300 |
parents | 720ae5085ee3 |
children |
line wrap: on
line source
#!/bin/sh # a test for issue586 hg init a cd a echo a > a hg ci -Ama hg init ../b cd ../b echo b > b hg ci -Amb hg pull -f ../a hg merge hg rm -f a hg ci -Amc hg st -A