Mercurial > hg
view tests/test-pull-permission @ 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 | c0b449154a90 |
children | 4c94b6d0fb1c |
line wrap: on
line source
#!/bin/sh mkdir a cd a hg init echo foo > b hg add b hg ci -m "b" -d "1000000 0" chmod -w .hg/store cd .. hg clone a b chmod +w a/.hg/store # let test clean up cd b hg verify