Fix btree_gin regression tests

Author: reshke

contrib/btree_gin/expected/bool.out

@@ -93,28 +93,18 @@ EXPLAIN (COSTS OFF) SELECT * FROM test_bool WHERE i<=true ORDER BY i;
 (9 rows)
 
 EXPLAIN (COSTS OFF) SELECT * FROM test_bool WHERE i=true ORDER BY i;
-<<<<<<< HEAD
                 QUERY PLAN                
 ------------------------------------------
- Gather Motion 3:1  (slice1; segments: 3)
+ Gather Motion 1:1  (slice1; segments: 1)
    Merge Key: i
    ->  Sort
          Sort Key: i
-         ->  Seq Scan on test_bool
-               Filter: i
+         ->  Bitmap Heap Scan on test_bool
+               Recheck Cond: i
+               ->  Bitmap Index Scan on idx_bool
+                     Index Cond: (i = true)
  Optimizer: Postgres query optimizer
-(7 rows)
-=======
-                QUERY PLAN                 
--------------------------------------------
- Sort
-   Sort Key: i
-   ->  Bitmap Heap Scan on test_bool
-         Recheck Cond: i
-         ->  Bitmap Index Scan on idx_bool
-               Index Cond: (i = true)
-(6 rows)
->>>>>>> REL_16_9
+(9 rows)
 
 EXPLAIN (COSTS OFF) SELECT * FROM test_bool WHERE i>=true ORDER BY i;
                    QUERY PLAN                    
@@ -148,11 +138,14 @@ EXPLAIN (COSTS OFF) SELECT * FROM test_bool WHERE i>true ORDER BY i;
 EXPLAIN (COSTS OFF) SELECT * FROM test_bool WHERE i=false ORDER BY i;
                 QUERY PLAN                 
 -------------------------------------------
- Sort
-   Sort Key: i
-   ->  Bitmap Heap Scan on test_bool
-         Recheck Cond: (NOT i)
-         ->  Bitmap Index Scan on idx_bool
-               Index Cond: (i = false)
-(6 rows)
+ Gather Motion 1:1  (slice1; segments: 1)
+   Merge Key: i
+   ->  Sort
+         Sort Key: i
+         ->  Bitmap Heap Scan on test_bool
+               Recheck Cond: (NOT i)
+               ->  Bitmap Index Scan on idx_bool
+                     Index Cond: (i = false)
+ Optimizer: Postgres query optimizer
+(9 rows)