Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-586 @ 4676:0f6e2b37512d
Merge with Eric Hopper
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 21 Jun 2007 18:05:14 -0500 |
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