view tests/test-conflict @ 4743:cc0fb3500dd5

mercurial.spec: include various utility files from contrib/ in rpm Files included: hgk convert-repo hg-ssh hg-viz git-rev-tree bash_completion zsh_completion mercurial.el
author Adam Spiers <hg@adamspiers.org>
date Sun, 03 Jun 2007 14:40:56 +0100
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