From 6421387b9888acd36b8fddc9b8bb6688f171acb4 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 7 Jul 2012 17:56:48 +0100 Subject: [PATCH] notation: use \commitmergename in its definition text, and clarify --- notation.tex | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/notation.tex b/notation.tex index f8f2b87..82a2e64 100644 --- a/notation.tex +++ b/notation.tex @@ -112,7 +112,7 @@ $$ $$ \item[ $\displaystyle \commitmergeof{C}{L}{M}{R} $ ] -The contents of a git merge result: +$C$ has exactly the contents of a git merge result: $\displaystyle D \isin C \equiv \begin{cases} @@ -121,4 +121,6 @@ $\displaystyle D \isin C \equiv \end{cases} $ +We will refer to this as \commitmergename. + \end{basedescript} -- 2.30.2