Mercurial > hg

view tests/test-issue619 @ 12169:b62276658844

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
zsh completion: bookmarks support
author Brendan Cully <brendan@kublai.com>
date Sun, 05 Sep 2010 13:37:17 -0700
parents 4c94b6d0fb1c
children
line wrap: on
line source

#!/bin/sh

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

echo fast-forward
hg merge b
hg ci -Ammerge

echo bogus fast-forward should fail
hg merge b

echo done