##// END OF EJS Templates
scripts/i18n: let 'normalized-merge' leave 3-way conflict markers in output file...
scripts/i18n: let 'normalized-merge' leave 3-way conflict markers in output file 3-way conflict markers in the output file can be convenient ... and they do no harm when merge tools like kdiff3 will overwrite output anyway.
Mads Kiilerich -
r8188:f8314738 default
Show More
Name Size Modified Last Commit Author
/ scripts
contributor_data.py Loading ...
dbmigrate-test Loading ...
docs-headings.py Loading ...
generate-ini.py Loading ...
i18n Loading ...
i18n_utils.py Loading ...
logformat.py Loading ...
make-release Loading ...
pyflakes Loading ...
run-all-cleanup Loading ...
shortlog.py Loading ...
update-copyrights.py Loading ...
validate-commits Loading ...
validate-minimum-dependency-versions Loading ...
whitespacecleanup.sh Loading ...