Merge branch 'nd/worktree-lock' into maint
commit797d1a4672c67ed4e560c67c5d1fe208e31f0b47
authorJunio C Hamano <gitster@pobox.com>
Tue, 29 Nov 2016 21:28:02 +0000 (29 13:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 29 Nov 2016 21:28:02 +0000 (29 13:28 -0800)
tree7a4b3fa36c96aefc16cb3c3c9897eb13f13b0752
parentd92466ee25ca2dd79c6f0f7a804f765a5930990c
parent2b090822e8d4d2002499bb0fb02a611bb2c775a9
Merge branch 'nd/worktree-lock' into maint

Typofix.

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