##// END OF EJS Templates
merge: define conflict marker labels in filemerge()...
merge: define conflict marker labels in filemerge() Moves the conflict marker definition up to filemerge, so it gets applied to all merge strategies, and so in a future patch we can manipulate the markers.

File last commit:

r14286:005a540e default
r21273:20b8090d default
Show More
test-bad-extension.t
15 lines | 518 B | text/troff | Tads3Lexer
/ tests / test-bad-extension.t
$ echo 'raise Exception("bit bucket overflow")' > badext.py
$ abspath=`pwd`/badext.py
$ echo '[extensions]' >> $HGRCPATH
$ echo "gpg =" >> $HGRCPATH
$ echo "hgext.gpg =" >> $HGRCPATH
$ echo "badext = $abspath" >> $HGRCPATH
$ echo "badext2 =" >> $HGRCPATH
$ hg -q help help
*** failed to import extension badext from $TESTTMP/badext.py: bit bucket overflow
*** failed to import extension badext2: No module named badext2
hg help [-ec] [TOPIC]
show help for a given topic or a help overview