]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitb30a4435ed0e96212f6023cb7a952b95a58de818
tree45ae507cb2c5101498c13133f0b064bdc3dd4696tree | snapshot
parent553ea9d8c7f42803272f0f1bcaa060408e8a104ccommit | diff
parentedbf9a2e20f659539a3be062c455624a6e7cd77bcommit | diff
Merge branch 'nb/doc-mergetool-typofix' into maint-2.38

Typofix.

* nb/doc-mergetool-typofix:
  mergetool.txt: typofix 'overwriten' -> 'overwritten'
Documentation/config/mergetool.txt diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.