notation: clarify git merge notations

[topbloke-formulae.git] / article.tex

diff --git a/article.tex b/article.tex
index 82e7428ebb3f721b9cc94d9bdae33ab17a966e46..59ae0eba401b1524ab74b771753d929dcbecfb5f 100644 (file)
--- a/article.tex
+++ b/article.tex
@@ -5,6 +5,7 @@
 \usepackage{mathabx}
 \usepackage{txfonts}
 \usepackage{amsfonts}
+\usepackage{eufrak}
 \usepackage{mdwlist}
 %\usepackage{lastpage}
 %\usepackage{accents}
@@ -39,6 +40,8 @@
           \hidehacktrue\ifhidehack#1\else#2\fi\hidehackfalse}
         \newcommand{\pa}[1]{\hidefromedef{\varmathbb{#1}}{#1}}
 
+\newcommand{\stmt}[1]{\mathfrak{#1}}
+
 \newcommand{\set}[1]{\mathbb{#1}}
 \newcommand{\pay}[1]{\pa{#1}^+}
 \newcommand{\pan}[1]{\pa{#1}^-}
@@ -86,7 +89,7 @@
 \newcommand{\pendsof}[2]{\pends ( #1 , #2 ) }
 
 %\newcommand{\commitmerge}{\text{\commitmergename}}
-\newcommand{\commitmergeof}[4]{#1 \approx \stmtmergeof{#2}{#3}{#4}}
+\newcommand{\commitmergeof}[4]{#1 \has \stmtmergeof{#2}{#3}{#4}}
 %\newcommand{\merge}[4]{{#2 {{\frac{ #1 }{ #3 } #4}}}}
 \newcommand{\commitmergename}{Git Merge}