]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'en/typofixes'
authorJunio C Hamano <gitster@pobox.com>
Tue, 28 Sep 2021 20:06:53 +0000 (13:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Sep 2021 20:06:53 +0000 (13:06 -0700)
Typofixes.

* en/typofixes:
  merge-ort: fix completely wrong comment
  trace2.h: fix trivial comment typo

1  2 
merge-ort.c
trace2.h

diff --cc merge-ort.c
Simple merge
diff --cc trace2.h
Simple merge