tests/test-merge4
author Matt Mackall <mpm@selenic.com>
Sat, 09 Dec 2006 12:46:01 -0600
changeset 3843 abaa2cd00d2b
parent 2283 e506c14382fd
permissions -rwxr-xr-x
make transcoding more robust default to ASCII abort if unknown encoding wrap abort strings with _ add test

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "1000000 0"
hg update 0
echo This is file c1 > c
hg add c
hg commit -m "commit #2" -d "1000000 0"
hg merge 1
rm b
echo This is file c22 > c
hg commit -m "commit #3" -d "1000000 0"