From 117c31e0202e39fc17f2f12c3690942d3c991cfd Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 10 Aug 2013 20:21:37 +0100 Subject: [PATCH 1/1] pseudomerge: fix terminology for foreign commits --- pseudomerge.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pseudomerge.tex b/pseudomerge.tex index c1a88f8..b4022da 100644 --- a/pseudomerge.tex +++ b/pseudomerge.tex @@ -45,7 +45,7 @@ $\isforeign{D} \implies \big[ D \le C \equiv D \le L \big]$. Trivial by Foreign Unaffected and the definition of $\pends$ } -It might seem that bare git commits might also be psuedo-merges --- +It might seem that foreign commits might also be psuedo-merges --- e.g., merges made directly with {\tt git merge -s ours}. However, by our definition of $\has$, these are considered simply as normal merges (\autoref{commit-merge}). -- 2.30.2