| 617 | } |
| 618 | |
| 619 | static int error_dirty_index(struct repository *repo, struct replay_opts *opts) |
| 620 | { |
| 621 | if (repo_read_index_unmerged(repo)) |
| 622 | return error_resolve_conflict(action_name(opts)); |
| 623 | |
| 624 | error(_("your local changes would be overwritten by %s."), |
| 625 | _(action_name(opts))); |
| 626 | |
| 627 | if (advice_enabled(ADVICE_COMMIT_BEFORE_MERGE)) |
| 628 | advise(_("commit your changes or stash them to proceed.")); |
| 629 | return -1; |
| 630 | } |
| 631 | |
| 632 | static void update_abort_safety_file(void) |
| 633 | { |
no test coverage detected