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

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

tests: guess lexer by filename for recent pygments...
tests: guess lexer by filename for recent pygments Recent pygments guess AntlrJavaLexer for the isolatin text, converted to ascii by util.tolocal, which yields class="err". Guess lexer by extension instead.
Alexis S. L. Carvalho - - Load All Authors

File last commit:

r5096:ad6b9713 default
r7959:5fb6edbf default
Show More
test-issue672
35 lines | 438 B | text/plain | TextLexer
/ tests / test-issue672
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
# 0-2-4
# \ \ \
# 1-3-5
#
# rename in #1, content change in #4.
hg init t
cd t
touch 1
touch 2
hg commit -Am init -d "0 0" # 0
hg rename 1 1a
hg commit -m rename -d "0 0" # 1
hg co -C 0
echo unrelated >> 2
hg ci -m unrelated1 -d "0 0" # 2
hg merge --debug 1
hg ci -m merge1 -d "0 0" # 3
hg co -C 2
echo hello >> 1
hg ci -m unrelated2 -d "0 0" # 4
hg co -C 3
hg merge -y --debug 4
hg co -C 4
hg merge -y --debug 3