Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge3 @ 1797:42f75cd04bf4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix hgmerge: mkdir "'/tmp'/hgmerge..." and ask_if_merged() didn't work.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 23 Feb 2006 14:42:47 +0100
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"