Terry J. Reedy added the comment: Making the upper merge context be
"==================================== " (a line of equals and 2 blanks) has worked great to eliminate backport merge conflicts.) ---------- stage: patch review -> needs patch _______________________________________ Python tracker <rep...@bugs.python.org> <https://bugs.python.org/issue30928> _______________________________________ _______________________________________________ Python-bugs-list mailing list Unsubscribe: https://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com
