view tests/test-merge3 @ 685:79fb7032739f

Added tag 0.6b for changeset 4ccf3de52989b14c3d84e1097f59e39a992e00bd
author Matt Mackall <mpm@selenic.com>
date Mon, 11 Jul 2005 21:58:57 -0800
parents 2fe8d66e3075
children 7e4843b7efd2
line wrap: on
line source

#!/bin/sh -x

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