Skip to content

Commit

Permalink
Merge pull request #291 from NicoWeio/zdiff3
Browse files Browse the repository at this point in the history
Recommend `zdiff3` instead of `diff3` as `merge.conflictstyle`
  • Loading branch information
SepplL authored Aug 7, 2024
2 parents 7e9a129 + 0fbc4e7 commit 3399c66
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git/content/git.tex
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@
\item Vorgeschlagene Nachricht kann angenommen werden (In vim \texttt{":wq"} eintippen)
\end{enumerate}
\end{enumerate}
Nützlich: \texttt{git config --global merge.conflictstyle diff3}
Nützlich: \texttt{git config --global merge.conflictstyle zdiff3}
\end{frame}

\begin{frame}{Zu früheren Versionen zurückkehren}
Expand Down

0 comments on commit 3399c66

Please sign in to comment.