view tests/test-conflict @ 1731:251729df9cc6

add -p option to tip. for issue 64.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Wed, 15 Feb 2006 11:05:43 -0800
parents 0902ffece4b4
children c71420b186b0
line wrap: on
line source

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "0 0"
echo "something" > a
hg commit -m branch1 -d "0 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "0 0"
HGMERGE=merge; export HGMERGE
hg up -m 1
hg id
grep -Ev ">>>|<<<" a
hg status