diff options
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 1c9c30db6c..d86be9b521 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -2016,7 +2016,7 @@ int merge_recursive_generic(struct merge_options *o, result); if (active_cache_changed && write_locked_index(&the_index, lock, COMMIT_LOCK)) - return error(_("Unable to write index.")); + return error(_("unable to write index file")); return clean ? 0 : 1; } |