##// END OF EJS Templates
tests: stabilize test-merge-tools.t on Windows...
tests: stabilize test-merge-tools.t on Windows More fun with `hg import --bypass` to work around Windows limitations. The diffs were generated on Linux, and had a tab to terminate the `+++b/...` lines. But check-code complained about trailing whitespace, and it seems to run without them.

File last commit:

r29813:5f86818c default
r39219:7a111168 default
Show More
map
2 lines | 45 B | text/plain | TextLexer
__base__ = ../paper/map
header = header.tmpl