diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-10 10:08:22 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-10 10:08:22 +0200 |
| commit | 8e36002adda45a35c6fc4daf81913c3d2102cb59 (patch) | |
| tree | e3640ac0242262814f2b2d4c2a01c4332faeb18c /unpack-trees.c | |
| parent | Merge branch 'ma/ts-cleanups' (diff) | |
| parent | treewide: correct several "up-to-date" to "up to date" (diff) | |
| download | git-8e36002adda45a35c6fc4daf81913c3d2102cb59.tar.xz git-8e36002adda45a35c6fc4daf81913c3d2102cb59.zip | |
Merge branch 'ma/up-to-date'
Message and doc updates.
* ma/up-to-date:
treewide: correct several "up-to-date" to "up to date"
Documentation/user-manual: update outdated example output
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 68d34259c6..87e8c69597 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -163,7 +163,7 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, msgs[ERROR_BIND_OVERLAP] = _("Entry '%s' overlaps with '%s'. Cannot bind."); msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] = - _("Cannot update sparse checkout: the following entries are not up-to-date:\n%s"); + _("Cannot update sparse checkout: the following entries are not up to date:\n%s"); msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] = _("The following working tree files would be overwritten by sparse checkout update:\n%s"); msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] = |