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
This commit is contained in:
Junio C Hamano 2016-07-06 13:06:40 -07:00
Родитель 1729853432 2a0e6cdeda
Коммит 89aef71d0e
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -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"));
}
}