merge(third_party/git): Merge squashed git subtree at v2.23.0 r/373

Merge commit '1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5' as 'third_party/git'

3 files changed, 17 insertions, 0 deletions

diff --git a/third_party/git/t/t4034/tex/expect b/third_party/git/t/t4034/tex/expect
new file mode 100644
index 000000000000..604969bcde9b
--- /dev/null
+++ b/third_party/git/t/t4034/tex/expect
@@ -0,0 +1,9 @@
+<BOLD>diff --git a/pre b/post<RESET>
+<BOLD>index 2b2dfcb..65cab61 100644<RESET>
+<BOLD>--- a/pre<RESET>
+<BOLD>+++ b/post<RESET>
+<CYAN>@@ -1,4 +1,4 @@<RESET>
+\section{Something <GREEN>new<RESET>}
+<RED>\emph<RESET><GREEN>\textbf<RESET>{Macro style}
+{<RED>\em<RESET><GREEN>\bfseries<RESET> State toggle style}
+\\[<RED>1em<RESET><GREEN>1cm<RESET>]
diff --git a/third_party/git/t/t4034/tex/post b/third_party/git/t/t4034/tex/post
new file mode 100644
index 000000000000..65cab61a10bb
--- /dev/null
+++ b/third_party/git/t/t4034/tex/post
@@ -0,0 +1,4 @@
+\section{Something new}
+\textbf{Macro style}
+{\bfseries State toggle style}
+\\[1cm]
diff --git a/third_party/git/t/t4034/tex/pre b/third_party/git/t/t4034/tex/pre
new file mode 100644
index 000000000000..2b2dfcb65c57
--- /dev/null
+++ b/third_party/git/t/t4034/tex/pre
@@ -0,0 +1,4 @@
+\section{Something}
+\emph{Macro style}
+{\em State toggle style}
+\\[1em]