tests/test-merge8
author Brodie Rao <me+hg@dackz.net>
Sun, 14 Feb 2010 01:52:31 -0500
branchstable
changeset 10463 5ddde896a19d
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
remove unused imports

#!/bin/sh

# Test for changeset ba7c74081861
# (update dirstate correctly for non-branchmerge updates)
hg init a
cd a
echo a > a
hg add a
hg commit -m a
cd ..
hg clone a b
cd a
hg mv a b
hg commit -m move
echo b >> b
hg commit -m b
cd ../b
hg pull ../a
hg update