view tests/test-conflict @ 4731:1d5a2ee683b0

Fix tgz archival on Windows. Making tgz's on Windows has been broken by 06de65673ec2 due to not being careful enough about binary mode opens.
author csaba.henk@creo.hu
date Wed, 27 Jun 2007 08:35:26 -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