Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge3 @ 1663:d529cdc0a3ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
return a non-zero exit code when a merge failed
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 30 Jan 2006 12:02:06 +1300
parents 0902ffece4b4
children 7544700fd931
line wrap: on
line source

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "0 0"
touch b
hg add b
rm b
hg commit -A -m"comment #1" -d "0 0"