From fe7301ba3a2aeb7ee10d6b5810a716e4a5c7fc98 Mon Sep 17 00:00:00 2001
From: Rob Rix <rob.rix@github.com>
Date: Mon, 11 Apr 2016 12:04:19 -0400
Subject: [PATCH] Revert "Bind lists of intersecting & nonintersecting
 children."

This reverts commit 2453b500adc0774ab5311ca1eca946806b2bb9c9.
---
 src/Alignment.hs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Alignment.hs b/src/Alignment.hs
index a0297c5a4..3a6d77058 100644
--- a/src/Alignment.hs
+++ b/src/Alignment.hs
@@ -141,7 +141,6 @@ groupChildrenByLine ranges children | not (and $ null <$> ranges)
 group2 :: Join These [Range] -> [AlignedDiff leaf] -> (Join These [Range], [AlignedDiff leaf], [Join These (Range, [SplitDiff leaf Info])])
 group2 ranges children | Just (headRanges, _) <- unconsThese ranges
                        , ~(group, l, r, rest) <- spanThese (intersects headRanges) children
-                       , ~(intersecting, nonIntersecting) <- span (or . intersects headRanges . head) children
                        , merged <- pairRangesWithLine headRanges $ fmap catMaybes (Join (uncurry These (unalign (runJoin <$> join group))))
                        , ~(moreRanges, moreChildren, remainingLines) <- group2 (modifyJoin (bimap (if null l && not (null r) then id else drop 1) (if null r && not (null l) then id else drop 1)) ranges) (l ++ r ++ rest)
                        = (moreRanges, moreChildren, merged : remainingLines)