Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge3 @ 1571:bcdc030c59f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add a --switch-parent option to export against the other parent
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 14 Dec 2005 21:01:57 -0600
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"