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

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

1  2 
Documentation/git-worktree.txt

Simple merge