Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge3 @ 2087:19fcc2889bad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with mainline.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Tue, 18 Apr 2006 20:33:33 -0700
parents 7544700fd931
children
line wrap: on
line source

#!/bin/sh

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