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

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

Update win32 merge tools configuration...
Update win32 merge tools configuration Add WinMerge and Beyond Compare 3 to default merge tools configuration. Fix TortoiseMerge configuration.
Matt Mackall - - Load All Authors

File last commit:

r4748:8808ea7d default
r7665:950484f0 default
Show More
test-issue619
20 lines | 257 B | text/plain | TextLexer
/ tests / test-issue619
History | Annotation | Raw |Copy content |Copy permalink
#!/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