view tests/test-conflict @ 5024:7963438881f5

convert: empty log messages are OK as of 7f5c3fb0a37d
author Bryan O'Sullivan <bos@serpentine.com>
date Fri, 27 Jul 2007 14:30:20 -0700
parents 93a4e72b4f83
children
line wrap: on
line source

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "1000000 0"
echo "something" > a
hg commit -m branch1 -d "1000000 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "1000000 0"
hg merge 1
hg id
cat a
hg status