Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-issue619 @ 5417:b8872655f951

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgk: allow any extdiff command for visual diff
author TK Soh <teekaysoh@yahoo.com>
date Mon, 08 Oct 2007 11:18:34 +0800
parents 8808ea7da86b
children
line wrap: on
line source

#!/bin/sh

mkdir t
cd t
hg init
echo a > a
hg ci -Ama -d '1000000000 0'
echo b > b
hg branch b
hg ci -Amb -d '1000000000 0'
hg co -C 0

echo fast-forward
hg merge b
hg ci -Ammerge -d '1000000000 0'

echo bogus fast-forward should fail
hg merge b

echo done