view tests/test-conflict @ 6741:5918e2b79859

context: simplify changeid logic
author Matt Mackall <mpm@selenic.com>
date Thu, 26 Jun 2008 13:46:31 -0500
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