From 62889d78d1c4473e5681192eaabaa3aed5e66bdd Mon Sep 17 00:00:00 2001
From: Philip Monk <phil@pcmonk.me>
Date: Mon, 1 Jun 2020 20:46:43 -0700
Subject: [PATCH] txt: don't conflict if identical changes

---
 pkg/arvo/mar/txt.hoon | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkg/arvo/mar/txt.hoon b/pkg/arvo/mar/txt.hoon
index f87f58fe8..808a59aa1 100644
--- a/pkg/arvo/mar/txt.hoon
+++ b/pkg/arvo/mar/txt.hoon
@@ -55,7 +55,7 @@
           |=(cud/(urge cord) [i.bob cud])
         %+  bind  $(ali t.ali, p.i.bob (sub p.i.bob p.i.ali))
         |=(cud/(urge cord) [i.ali cud])
-    ::
+      ::
           %|
         ?:  =(p.i.ali (lent p.i.bob))
           %+  bind  $(ali t.ali, bob t.bob)
@@ -68,7 +68,12 @@
     ::
         %|
       ?-  -.i.bob
-          %|  ~
+          %|
+        ?.  =(i.ali i.bob)
+          ~
+        %+  bind  $(ali t.ali, bob t.bob)
+        |=(cud/(urge cord) [i.ali cud])
+      ::
           %&
         ?:  =(p.i.bob (lent p.i.ali))
           %+  bind  $(ali t.ali, bob t.bob)