X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-write-tree.c;h=9d640508dd8eb62201b286490b7f83486470d611;hb=49129d3731a6d74ad403ecdffc0e7940a597bc65;hp=52a3c015ff8e4611522bd41078bdb2934d288d35;hpb=5fc3e67ac0241c491dcf1c0c9dcd4a4d83e7c243;p=git.git diff --git a/builtin-write-tree.c b/builtin-write-tree.c index 52a3c015f..9d640508d 100644 --- a/builtin-write-tree.c +++ b/builtin-write-tree.c @@ -42,7 +42,7 @@ int cmd_write_tree(int argc, const char **argv, const char *unused_prefix) die("%s: error reading the index", me); break; case WRITE_TREE_UNMERGED_INDEX: - die("%s: error building trees; the index is unmerged?", me); + die("%s: error building trees", me); break; case WRITE_TREE_PREFIX_ERROR: die("%s: prefix %s not found", me, prefix);