Merge branch 'dm/svn-remote'

diff --git a/builtin-write-tree.c b/builtin-write-tree.c
index c2187997447df64948577d8a9a78f4462239b369..9d640508dd8eb62201b286490b7f83486470d611 100644 (file)
--- a/builtin-write-tree.c
+++ b/builtin-write-tree.c
@@ -9,7 +9,7 @@
 #include "cache-tree.h"
 
 static const char write_tree_usage[] =
-"git-write-tree [--missing-ok] [--prefix=<prefix>/]";
+"git write-tree [--missing-ok] [--prefix=<prefix>/]";
 
 int cmd_write_tree(int argc, const char **argv, const char *unused_prefix)
 {
@@ -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);