diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-11-17 13:45:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-11-17 13:45:21 -0800 |
| commit | 166251c32e69e9a66913c62e9263135f8ae103e6 (patch) | |
| tree | 4462b65c692e5af670c9352c3b6ae6dafec69c5a /merge-recursive.c | |
| parent | 3ab228137f980ff72dbdf5064a877d07bec76df9 (diff) | |
| parent | 2b090822e8d4d2002499bb0fb02a611bb2c775a9 (diff) | |
| download | git-166251c32e69e9a66913c62e9263135f8ae103e6.tar.gz git-166251c32e69e9a66913c62e9263135f8ae103e6.tar.xz | |
Merge branch 'nd/worktree-lock'
Typofix.
* nd/worktree-lock:
git-worktree.txt: fix typo "to"/"two", and add comma
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions