view tests/test-merge8 @ 9401:2a5144687727

doc/Makefile: Don't show Makefile comments in output The comments makes sense when editing Makefile, but not when watching its output where it looks too much like error messages.
author Mads Kiilerich <mads@kiilerich.com>
date Thu, 20 Aug 2009 23:35:47 +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