From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 17 Nov 2016 21:45:21 +0000 (-0800)
Subject: Merge branch 'nd/worktree-lock'
X-Git-Tag: v2.11.0-rc2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/166251c32e69e9a66913c62e9263135f8ae103e6?hp=3ab228137f980ff72dbdf5064a877d07bec76df9

Merge branch 'nd/worktree-lock'

Typofix.

* nd/worktree-lock:
git-worktree.txt: fix typo "to"/"two", and add comma
---

diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
index 0aeb020d02..e257c19ebe 100644
--- a/Documentation/git-worktree.txt
+++ b/Documentation/git-worktree.txt
@@ -133,7 +133,7 @@ OPTIONS
 +
 If the last path components in the working tree's path is unique among
 working trees, it can be used to identify worktrees. For example if
-you only have to working trees at "/abc/def/ghi" and "/abc/def/ggg",
+you only have two working trees, at "/abc/def/ghi" and "/abc/def/ggg",
 then "ghi" or "def/ghi" is enough to point to the former working tree.
 
 DETAILS