view tests/test-conflict @ 6550:628da4a91628

Merge with crew-stable, fix test output
author Patrick Mezard <pmezard@gmail.com>
date Mon, 14 Apr 2008 23:28:50 +0200
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