tests/test-merge8
author Steve Borho <steve@borho.org>
Fri, 07 Dec 2007 18:15:24 -0600
changeset 5623 f22708f50213
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
win32: do not install bash hgmerge on Windows

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