From: Eric S. Raymond <esr@thyrsus.com>
Date: Tue, 2 Sep 2003 08:56:27 +0000 (+0000)
Subject: Finally we seem to have merging right.
X-Git-Tag: 1.0~68
X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=d87a1b41dc878bbb5f8907c19eace34a05da1a32;p=comparator.git

Finally we seem to have merging right.
---

diff --git a/report.c b/report.c
index 0b14921..f064eca 100644
--- a/report.c
+++ b/report.c
@@ -341,7 +341,7 @@ struct match_t *reduce_matches(void)
 	     /* if all these matches are within the same tree, toss them */
 	     heterogenous = 0;
 	     for (i = 0; i < nmatches; i++)
-		 if (sametree(np[i].file, np[(i+1) % nmatches].file))
+		 if (!sametree(np[i].file, np[(i+1) % nmatches].file))
 		     heterogenous++;
 	     if (!heterogenous)
 		 continue;