tests/test-merge8
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 19 Jun 2007 08:06:37 +0200
changeset 4633 ff7253a0d1da
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
Cleanup of whitespace, indentation and line continuation.

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