Merge branch 'maint' into bc/master-diff-hunk-header-fix

diff --git a/builtin-commit.c b/builtin-commit.c
index 8165bb3d31c6cdd92c83663c5dd081e564dcfc1e..6b23143cd7e044927801608aa4f312245f6210f6 100644 (file)
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -639,7 +639,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix)
                active_cache_tree = cache_tree();
        if (cache_tree_update(active_cache_tree,
                              active_cache, active_nr, 0, 0) < 0) {
-               error("Error building trees");
+               error("Error building trees; the index is unmerged?");
                return 0;
        }