Merge branch 'lv/status-say-working-tree-not-directory' into maint

"git status" used to say "working directory" when it meant "working
tree".

* lv/status-say-working-tree-not-directory:
Use "working tree" instead of "working directory" for git status

diff --git a/wt-status.c b/wt-status.c
index 4f27bd62af992122d83df911c42b585342ac1066..4ce4e35ac3f3542c42c9f71e7bb3f0c5e2c67492 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -1554,7 +1554,7 @@ void wt_status_print(struct wt_status *s)
                        else
                                printf(_("nothing to commit\n"));
                } else
-                       printf(_("nothing to commit, working directory clean\n"));
+                       printf(_("nothing to commit, working tree clean\n"));
        }
 }