view tests/test-commit-copy @ 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
line wrap: on
line source

#!/bin/sh

hg init dir
cd dir
echo bleh > bar
hg add bar
hg ci -m 'add bar'

hg cp bar foo
echo >> bar
hg ci -m 'cp bar foo; change bar'

hg debugrename foo
hg debugindex .hg/store/data/bar.i