Mercurial > hg > pyhgsh

view tests/test-conflict @ 1471:f56f38a1a85f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rewrote changes function in dirstate to use generic walk code now, file with unsupported type will not show up in status anymore
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 27 Oct 2005 13:29:35 -0700
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