view tests/test-merge3 @ 1004:ad6fcceaf59b

Emacs: improved GNU Emacs support.
author bos@serpentine.internal.keyresearch.com
date Mon, 22 Aug 2005 15:29:55 -0700
parents 0902ffece4b4
children 7544700fd931
line wrap: on
line source

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "0 0"
touch b
hg add b
rm b
hg commit -A -m"comment #1" -d "0 0"