view tests/test-merge8 @ 9784:54d292da1df7

hgrc.5: do not mention "name: value" syntax

This was supported in versions prior to 1.3 where we used the standard
Python ConfigParser. The new config parser never supported it.

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