| 898 | |
| 899 | static void write_merge_state(struct commit_list *); |
| 900 | static void abort_commit(struct commit_list *remoteheads, const char *err_msg) |
| 901 | { |
| 902 | if (err_msg) |
| 903 | error("%s", err_msg); |
| 904 | fprintf(stderr, |
| 905 | _("Not committing merge; use 'git commit' to complete the merge.\n")); |
| 906 | write_merge_state(remoteheads); |
| 907 | exit(1); |
| 908 | } |
| 909 | |
| 910 | static const char merge_editor_comment[] = |
| 911 | N_("Please enter a commit message to explain why this merge is necessary,\n" |
no test coverage detected