Merge branch 'jh/trace2-pretty-output'

diff --git a/builtin/worktree.c b/builtin/worktree.c
index a5bb02b2076a27a78947fda25c1e16dafd637622..7f094f8170ae7d55d453a2b0ab5db933ddf395ba 100644 (file)
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -880,7 +880,7 @@ static void check_clean_worktree(struct worktree *wt,
                          original_path);
        ret = xread(cp.out, buf, sizeof(buf));
        if (ret)
-               die(_("'%s' is dirty, use --force to delete it"),
+               die(_("'%s' contains modified or untracked files, use --force to delete it"),
                    original_path);
        close(cp.out);
        ret = finish_command(&cp);