view tests/test-issue612 @ 5466:87860c62e003

mq.el: declare variable mq-top
author NIIMI Satoshi <sa2c@sa2c.net>
date Thu, 11 Oct 2007 06:01:30 +0900
parents 9797124581c9
children
line wrap: on
line source

#!/bin/sh

mkdir t
cd t

hg init
mkdir src
echo a > src/a.c
hg ci -Ama -d "10000000 0"

hg mv src source
hg ci -Ammove -d "1000000 0"

hg co -C 0
echo new > src/a.c
echo compiled > src/a.o
hg ci -mupdate -d "1000000 0"

hg st

hg merge

hg st