view tests/test-conflict @ 5466:87860c62e003

mq.el: declare variable mq-top
author NIIMI Satoshi <sa2c@sa2c.net>
date Thu, 11 Oct 2007 06:01:30 +0900
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