3134
3134
my_message = my_message.replace('\r\n', '\n')
3135
3135
my_message = my_message.replace('\r', '\n')
3136
3136
if my_message is None and not file:
3137
3138
t = make_commit_message_template_encoded(tree,
3138
3139
selected_list, diff=show_diff,
3139
3140
output_encoding=osutils.get_user_encoding())
3140
3142
start_message = generate_commit_message_template(commit_obj)
3141
3143
my_message = edit_commit_message_encoded(t,
3142
3144
start_message=start_message)