Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict @ 1582:63799b01985c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix the cat command - improve localrepo.walk when passed a node - make the differents walk commands in commands.py accept a node - change commands.cat to walk over a revision - add a test
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 06 Dec 2005 14:10:38 +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