view tests/test-merge3 @ 10860:36cec3184612 stable

Merge with i18n
author Matt Mackall <mpm@selenic.com>
date Mon, 05 Apr 2010 17:48:00 -0500
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"