diff options
-rw-r--r-- | merge-recursive.c | 4 | ||||
-rwxr-xr-x | t/t6044-merge-unrelated-index-changes.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 32529ca5b6..2fb1bdb010 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1984,9 +1984,9 @@ int merge_trees(struct merge_options *o, struct strbuf sb = STRBUF_INIT; if (!o->call_depth && index_has_changes(&the_index, &sb)) { - err(o, _("Dirty index: cannot merge (dirty: %s)"), + err(o, _("Your local changes to the following files would be overwritten by merge:\n %s"), sb.buf); - return 0; + return -1; } output(o, 0, _("Already up to date!")); *result = head; diff --git a/t/t6044-merge-unrelated-index-changes.sh b/t/t6044-merge-unrelated-index-changes.sh index 97f7460b02..d55f1649f0 100755 --- a/t/t6044-merge-unrelated-index-changes.sh +++ b/t/t6044-merge-unrelated-index-changes.sh @@ -116,7 +116,7 @@ test_expect_success 'recursive' ' test_path_is_missing .git/MERGE_HEAD ' -test_expect_failure 'recursive, when merge branch matches merge base' ' +test_expect_success 'recursive, when merge branch matches merge base' ' git reset --hard && git checkout B^0 && |