tests/test-merge3
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sun, 20 Aug 2006 00:44:53 -0300
changeset 2960 61afc32c1a49
parent 1933 7544700fd931
permissions -rwxr-xr-x
Avoid Python 2.5 warning demandload.py:112: Warning: 'as' will become a reserved keyword in Python 2.6

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