diff options
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 3b0f8f96d4..1e5e34b837 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -664,7 +664,7 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common, refresh_cache(REFRESH_QUIET); 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")); rollback_lock_file(&lock); if (!strcmp(strategy, "recursive") || !strcmp(strategy, "subtree")) { |