Merge branch 'nd/worktree-lock'
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Nov 2016 21:45:21 +0000 (13:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Nov 2016 21:45:21 +0000 (13:45 -0800)
Typofix.

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

1  2 
Documentation/git-worktree.txt
Simple merge