Mercurial > hg > pyhgsh

view tests/test-conflict @ 1847:94498a262d15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix annotate for removed files walk in the manifest files instead of the working dir files when running annotate
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 07 Mar 2006 20:37:27 +0100
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