##// END OF EJS Templates
filemerge: add support for the new "mergediff" marker style to premerge...
filemerge: add support for the new "mergediff" marker style to premerge This adds support for the new "mergediff" conflict marker style to "merge-tools.<tool>.premerge" (the new value is called "keep-mergediff"). Differential Revision: https://phab.mercurial-scm.org/D9606

File last commit:

r44296:b7af8a02 default
r46755:3ca5ca38 default
Show More
dirs_corpus.py
29 lines | 717 B | text/x-python | PythonLexer
from __future__ import absolute_import, print_function
import argparse
import zipfile
ap = argparse.ArgumentParser()
ap.add_argument("out", metavar="some.zip", type=str, nargs=1)
args = ap.parse_args()
with zipfile.ZipFile(args.out[0], "w", zipfile.ZIP_STORED) as zf:
zf.writestr(
"greek-tree",
"\n".join(
[
"iota",
"A/mu",
"A/B/lambda",
"A/B/E/alpha",
"A/B/E/beta",
"A/D/gamma",
"A/D/G/pi",
"A/D/G/rho",
"A/D/G/tau",
"A/D/H/chi",
"A/D/H/omega",
"A/D/H/psi",
]
),
)