Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge3 @ 1167:8787d2d5fc7d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added FIXME output to test-grep so the test will not fail.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 30 Aug 2005 19:32:11 +0200
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"