view tests/test-merge3 @ 6083:81a8667331e8

convert: detect baz before tla The former seems to handle repositories built by the latter, the opposite is not true.
author Patrick Mezard <pmezard@gmail.com>
date Tue, 12 Feb 2008 23:35:35 +0100
parents 7544700fd931
children 6a64813276ed
line wrap: on
line source

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