am: suppress apply errors when using 3-way

diff --git a/builtin-write-tree.c b/builtin-write-tree.c
index 52a3c015ff8e4611522bd41078bdb2934d288d35..9d640508dd8eb62201b286490b7f83486470d611 100644 (file)
--- 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);