3158
3158
my_message = my_message.replace('\r\n', '\n')
3159
3159
my_message = my_message.replace('\r', '\n')
3160
3160
if my_message is None and not file:
3161
3162
t = make_commit_message_template_encoded(tree,
3162
3163
selected_list, diff=show_diff,
3163
3164
output_encoding=osutils.get_user_encoding())
3164
3166
start_message = generate_commit_message_template(commit_obj)
3165
3167
my_message = edit_commit_message_encoded(t,
3166
3168
start_message=start_message)