Mercurial > hg
view tests/test-strict @ 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 | 4e815ee377fd |
children | 6c82beaaa11a |
line wrap: on
line source
#!/bin/sh hg init echo a > a hg ci -d '0 0' -Ama hg an a echo "[ui]" >> $HGRCPATH echo "strict=True" >> $HGRCPATH hg an a hg annotate a echo % should succeed - up is an alias, not an abbreviation hg up