view tests/test-conflict @ 4562:d48e1b5f8265

patchbomb: 0c61124ad877 moved setremoteconfig into cmdutil
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 12 Jun 2007 14:39:36 -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