view tests/test-conflict @ 2410:1e80d47b8581

debugconfig: allow to print by section and exact item name
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Thu, 08 Jun 2006 11:28:27 -0700
parents e506c14382fd
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"
HGMERGE=merge; export HGMERGE
hg merge 1
hg id
egrep -v ">>>|<<<" a
hg status