]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 553ea9d edbf9a2)
Merge branch 'nb/doc-mergetool-typofix' into maint-2.38
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2022 00:11:38 +0000 (17:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2022 00:11:38 +0000 (17:11 -0700)
Typofix.

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

1  2 
Documentation/config/mergetool.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/config/mergetool.txt
Simple merge
Unnamed repository; edit this file 'description' to name the repository.