view tests/test-empty-dir @ 1663:d529cdc0a3ee

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 ba198d17eea9
line wrap: on
line source

#!/bin/sh

hg init
echo 123 > a
hg add a
hg commit -m "first" -d "0 0" a
mkdir sub
echo 321 > sub/b
hg add sub/b
hg commit -m "second" -d "0 0" sub/b
cat sub/b
hg co 0
cat sub/b
ls sub

true