Commit 261a69d3 authored by Lukas Nagel's avatar Lukas Nagel
Browse files

fix: three way merge

branch that was merged got moved falsely
parent 8fe93381
......@@ -18,7 +18,7 @@
\commit[right=of \cF ]{\cH}{lightblue}{\cF, \cJ}
\branch[right=of \cH]{B}{\cH}
\branch[below=of B]{A}{\cH}
\branch[right=of \cJ]{A}{\cJ}
\branch{C}{\cD}
\HEAD{B}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment