tests/test-merge8
author Matt Mackall <mpm@selenic.com>
Wed, 02 Apr 2008 18:51:06 -0500
changeset 6454 eec89a03db08
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
coal: even more tweaks - rearrange file browser columns - add folder and file icons - make browse table uniformly monospaced - use lowercase consistently for column heads - fix search container div

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