Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-586 @ 5443:58496354773f
Merge with crew
Those crew folks are getting lazy about pulling from upstream before
committing.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 11 Oct 2007 00:46:40 -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