]> git.ipfire.org Git - thirdparty/git.git/commit - t/t7011-skip-worktree-reading.sh
Merge branch 'nb/doc-mergetool-typofix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Oct 2022 17:36:12 +0000 (10:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Oct 2022 17:36:12 +0000 (10:36 -0700)
commit39c1578c5e4cb39036612718ba64a683e842f316
treedbed45b37ec0386cfda2bbc466e2775adc51685a
parentb0416d8f4a574fadfaac19a69b9e5a1f8e4405d2
parentedbf9a2e20f659539a3be062c455624a6e7cd77b
Merge branch 'nb/doc-mergetool-typofix'

Typofix.

* nb/doc-mergetool-typofix:
  mergetool.txt: typofix 'overwriten' -> 'overwritten'
Documentation/config/mergetool.txt