tests/test-merge8
author Martin Geisler <mg@lazybytes.net>
Sat, 14 Aug 2010 01:58:04 +0200
changeset 11846 650402ea4a4f
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
tests: unify test-586

#!/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