tests/test-merge4
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Fri, 08 Dec 2006 22:01:05 -0200
changeset 3835 d1ce5461beed
parent 2283 e506c14382fd
permissions -rwxr-xr-x
Allow the user to specify the fallback encoding for the changelog Example: use EUC-JP instead of ISO-8859-1: [ui] fallbackencoding = EUC-JP

#!/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"