From 24f522281c1df73f62b8974e98107f2b20b8888f Mon Sep 17 00:00:00 2001
From: Jared Hance <jared.hance@case.edu>
Date: Wed, 6 Aug 2014 09:49:10 -0400
Subject: [PATCH] Some %fine merges weren't doing anything, oops

---
 arvo/zuse.hoon | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/arvo/zuse.hoon b/arvo/zuse.hoon
index 6269d88273..bab744d462 100644
--- a/arvo/zuse.hoon
+++ b/arvo/zuse.hoon
@@ -1653,17 +1653,21 @@
           =+  owr=(~(got by hit) let)
           ?:  =(der owr)
             [~ ~]
+          ?:  (~(has in (zule owr)) der)
+            [~ ~]
           ?.  (~(has in (zule der)) owr)
             ~                                          ::  not a fast forward
           ~&  [%merge-fine p.sab q.sab]
-          [~ [~ [let.for hit.for hut lat]]]
+          [~ [~ [+(let) (~(put by hit) +(let) der) hut lat]]]
         ?(%mate %that %this %meld)
           =+  foreign-head=(~(got by hut) (~(got by hit.for) let.for))
           =+  our-head=(~(got by hut) (~(got by hit) let))
-          ?:  &(|(=(gem %mate) =(gem %meld)) (~(has in (zule r.foreign-head)) r.our-head))
-            $(gem %fine)                               ::  use fast forward
           ?:  =(r.foreign-head r.our-head)
             [~ ~]                                      ::  up to date
+          ?:  (~(has in (zule r.our-head)) r.foreign-head)
+            [~ ~]                                      ::  up to date
+          ?:  &(|(=(gem %mate) =(gem %meld)) (~(has in (zule r.foreign-head)) r.our-head))
+            $(gem %fine)                               ::  use fast forward
           =+  gar=(mer our-head foreign-head now (strat gem))
           =+  yak=-.gar
           =+  hek=+.gar