tests/test-merge8
author Matt Mackall <mpm@selenic.com>
Mon, 31 May 2010 12:57:24 -0500
branchstable
changeset 11246 8f5ad12db28e
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
Merge with i18n

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