view tests/test-merge3 @ 2743:a31f0f2997e9

import: switch from application/x-patch to text/x-diff christian ebert says his mailer was broken.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Mon, 31 Jul 2006 12:02:13 -0700
parents 7544700fd931
children
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"