view tests/test-merge8 @ 10971:cbe400a8e217

doc: add generic frontend to rst2man and rst2html This will allow us to easily register new roles and directives.
author Martin Geisler <mg@aragost.com>
date Thu, 22 Apr 2010 09:57:04 +0200
parents efbe24c7d8d9
children
line wrap: on
line source

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