view tests/test-conflict @ 4695:c3da7b6cc975

purge: add the clean alias inspired by git-clean and svn-clean
author Emanuele Aina <em@nerd.ocracy.org>
date Sat, 23 Jun 2007 22:26:22 -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