##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

test-merge5: removed unnecessary parts of test...
test-merge5: removed unnecessary parts of test - no need to initialize a new directory - no need to fix the commit time, already done by run-tests - no need to exit 0, use exit code from hg instead - better spacing around comments
Matt Mackall - - Load All Authors

File last commit:

r4819:97971245 default
r12155:94ad12aa default
Show More
test-issue612
24 lines | 244 B | text/plain | TextLexer
/ tests / test-issue612
History | Annotation | Raw |Copy content |Copy permalink
#!/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