Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict @ 4528:85a69f4d1e80

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-config-case: print only the Section we're interested in. This allows us to add additional settings to the global hgrc file created by run-tests.py without breaking this test.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 08 Jun 2007 23:49:12 -0300
parents 93a4e72b4f83
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"
hg merge 1
hg id
cat a
hg status