Files
@ f8314738030a
Branch filter:
Location: kallithea/docs/readme.rst - annotation
f8314738030a
42 B
text/prs.fallenstein.rst
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.
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.