Mercurial > hg
view tests/test-requires @ 3869:ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
b2ae81a7df29 already implemented this for branch merges.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 11 Dec 2006 18:09:52 +0100 |
parents | 8f18e31c4441 |
children |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init echo a > a hg add a hg commit -m test -d "1000000 0" rm .hg/requires hg tip echo indoor-pool > .hg/requires hg tip true