diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-11-29 13:28:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-11-29 13:28:02 -0800 |
| commit | 797d1a4672c67ed4e560c67c5d1fe208e31f0b47 (patch) | |
| tree | 7a4b3fa36c96aefc16cb3c3c9897eb13f13b0752 /git-mergetool--lib.sh | |
| parent | Merge branch 'ps/common-info-doc' into maint (diff) | |
| parent | git-worktree.txt: fix typo "to"/"two", and add comma (diff) | |
| download | tgif-797d1a4672c67ed4e560c67c5d1fe208e31f0b47.tar.xz | |
Merge branch 'nd/worktree-lock' into maint
Typofix.
* nd/worktree-lock:
git-worktree.txt: fix typo "to"/"two", and add comma
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions