← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

Merge into bzr.dev, and move the NEWS entry to the 2.1.0b3 section.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3027
3027
        def get_message(commit_obj):
3028
3028
            """Callback to get commit message"""
3029
3029
            my_message = message
 
3030
            if my_message is not None and '\r' in my_message:
 
3031
                my_message = my_message.replace('\r\n', '\n')
 
3032
                my_message = my_message.replace('\r', '\n')
3030
3033
            if my_message is None and not file:
3031
3034
                t = make_commit_message_template_encoded(tree,
3032
3035
                        selected_list, diff=show_diff,