tests/test-merge3
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 23 Nov 2009 22:45:36 +0100
branchstable
changeset 9913 e3237af51def
parent 1933 7544700fd931
child 11177 6a64813276ed
permissions -rwxr-xr-x
run-tests: always set $COLUMNS, fix running tests under emacs shell fix tests failure reported by Neal Becker.

#!/bin/sh

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