tests/test-merge8
author Josef "Jeff" Sipek <jeffpc@josefsipek.net>
Tue, 29 May 2007 15:30:40 +0200
changeset 4453 28778dc77a4b
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
gitweb: shortlog template: removed excessive whitespace, added title bar. The title bar is currently empty, this is just a preparation for filling it with content.

#!/bin/sh

# Test for changeset ba7c74081861
# (update dirstate correctly for non-branchmerge updates)
hg init a
cd a
echo a > a
hg add a
hg commit -m a
cd ..
hg clone a b
cd a
hg mv a b
hg commit -m move
echo b >> b
hg commit -m b
cd ../b
hg pull ../a
hg update