diff --git a/Makefile b/Makefile
index cecedbd5e5..004129592f 100644
--- a/Makefile
+++ b/Makefile
@@ -38,6 +38,9 @@ fix-java-style:
 check-java-style:
 	./gradlew -q spotlessCheck javadoc requireJavadoc -g ../.gradle/
 
+update-small-results:
+	rm -rf test/small-goal-files/
+	rsync -av --exclude='*.pdf' --exclude='*.png' --exclude='*.pgf' results/small/ test/small-goal-files/
 
 # This target deletes files that are not committed to version control.
 clean:
diff --git a/test/check_equal_csv.py b/test/check_equal_csv.py
index a53e298eb3..b44e86208a 100755
--- a/test/check_equal_csv.py
+++ b/test/check_equal_csv.py
@@ -34,12 +34,31 @@ def remove_run_time(df):
     goal_folder = Path(args.goal_folder)
     actual_folder = Path(args.actual_folder)
 
+    for goal_file in goal_folder.glob("**/*.tex"):
+        goal_file = goal_file.relative_to(goal_folder)
+        print(f"Checking {goal_file}")
+        actual_file = actual_folder / goal_file
+        assert actual_file.exists(), f"{actual_file} does not exist"
+        with open(goal_folder / goal_file, "r") as goal_f:
+            goal_lines = goal_f.readlines()
+        with open(actual_file, "r") as actual_f:
+            actual_lines = actual_f.readlines()
+        if goal_lines != actual_lines:
+            print(f"{goal_folder/goal_file} and {actual_file} are not equal")
+            raise ValueError(f"{goal_folder/goal_file} and {actual_file} are not equal")
+
     for goal_file in goal_folder.glob("**/*.csv"):
         goal_file = goal_file.relative_to(goal_folder)
         print(f"Checking {goal_file}")
         actual_file = actual_folder / goal_file
         assert actual_file.exists(), f"{actual_file} does not exist"
-        goal_df = pd.read_csv(goal_folder / goal_file, header=0, index_col="idx")
+        try:
+            goal_df = pd.read_csv(goal_folder / goal_file, header=0, index_col="idx")
+        except Exception:
+            goal_df = pd.read_csv(goal_folder / goal_file)
+            actual_df = pd.read_csv(actual_file)
+            assert goal_df.equals(actual_df)
+            continue
         actual_df = pd.read_csv(actual_file, header=0, index_col="idx")
         goal_df = remove_run_time(goal_df)
         actual_df = remove_run_time(actual_df)
diff --git a/test/small-goal-files/all_repos_head_test_results.csv b/test/small-goal-files/all_repos_head_test_results.csv
new file mode 100644
index 0000000000..c6b3980b49
--- /dev/null
+++ b/test/small-goal-files/all_repos_head_test_results.csv
@@ -0,0 +1,5 @@
+idx,repository,language,architecture,community,continuous_integration,documentation,history,issues,license,size,unit_test,stars,scorebased_org,randomforest_org,scorebased_utl,randomforest_utl,head hash,head tree fingerprint,head test result
+0,benedikt-schesch/git-hires-merge-example,Java,1.0,1,0,0.433617,10.5,0.0,1,34146,0.448443,54,1,0,1,1,4ae40d33c3b959e3a15e458eb9b0676251e36a41,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Tests_passed
+1,mangstadt/ez-vcard,Java,1.0,1,0,0.433617,10.5,0.0,1,34146,0.448443,54,1,0,1,1,95298de036f1df38fd7ca7e3225c4fd5ad5c44e6,134a29559bbdf9bcea93d2153b59e65ef205410c0c295f63b6d82a5e9dc828f9,Tests_passed
+2,pedrovgs/algorithms,Java,0.932927,1,1,0.390942,89.0,0.75,1,6616,0.556371,1377,1,1,1,1,c108e3a4b4fa2556b8c88d7ab6803084b01a4364,3c7ee13d6f66c42510e5edb8cff2102d8c61ed625f7cc871397eaa2b1e529895,Tests_passed
+4,tntim96/jscover,Java,0.985816,1,0,0.490264,25.0,6.448276,1,54612,0.627527,298,1,1,1,1,fff7a84ce12a037518e3c58e1d941a4d3dabb7e2,db8ac3637a22e488a08c15d4ddae3d115f42359e9fd0f42e2b2246aa8767d43e,Tests_passed
diff --git a/test/small-goal-files/defs.tex b/test/small-goal-files/defs.tex
new file mode 100644
index 0000000000..259b1104e9
--- /dev/null
+++ b/test/small-goal-files/defs.tex
@@ -0,0 +1,30 @@
+\def\smallReposInitial{4\xspace}
+\def\smallReposValid{4\xspace}
+\def\smallMergesInitial{63\xspace}
+\def\smallMergesPer{50\xspace}
+\def\smallMergesNonTrivial{33\xspace}
+\def\smallReposNonTrivial{3\xspace}
+\def\smallMergesJavaDiff{10\xspace}
+\def\smallReposJavaDiff{4\xspace}
+\def\smallMergesJavaDiffAndParentsPass{6\xspace}
+\def\smallReposJavaDiffAndParentsPass{4\xspace}
+\def\smallReposSampled{4\xspace}
+\def\smallMergesSampled{6\xspace}
+\def\smallReposYieldedFull{0\xspace}
+\def\smallReposTotal{4\xspace}
+\def\smallMergesTotal{6\xspace}
+
+% Results
+\def\smallAverageTriesUntilPass{1.0\xspace}
+\def\smallNumberofMergesWith1TriesUntilPass{54\xspace}
+\def\smallSporkOverOrtCorrect{3\xspace}
+\def\smallSporkOverOrtIncorrect{0\xspace}
+\def\smallMainBranchMerges{4\xspace}
+\def\smallMainBranchMergesPercent{67\xspace}
+\def\smallOtherBranchMerges{2\xspace}
+\def\smallOtherBranchMergesPercent{33\xspace}
+\def\smallReposJava{4\xspace}
+
+% Timeout
+\def\smallParentTestTimeout{30\xspace}
+\def\smallMergeTestTimeout{45\xspace}
diff --git a/test/small-goal-files/merges_analyzed/benedikt-schesch/git-hires-merge-example.csv b/test/small-goal-files/merges_analyzed/benedikt-schesch/git-hires-merge-example.csv
index 557b27b8a6..d536e12d26 100644
--- a/test/small-goal-files/merges_analyzed/benedikt-schesch/git-hires-merge-example.csv
+++ b/test/small-goal-files/merges_analyzed/benedikt-schesch/git-hires-merge-example.csv
@@ -1,3 +1,3 @@
-idx,branch_name,merge,left,right,notes,num_diff_files,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,imports_involved,non_java_involved,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,test merge,sampled for testing
-1,refs/heads/main,4ae40d33c3b959e3a15e458eb9b0676251e36a41,48199306f02a82abdeff0c01fab1ce112126d727,488122ce6c91e157d1f49b88b79feaa083fdee5b,,2,2,2,4,1,False,True,True,2252a9465319d00b974abd931cc98e1f435b4fe232b4dd61a828ad40139ec20c,Tests_passed,3782e47be673266f23cba016dc13973231429bb34e4c08a314c5b2f6c37d238f,Tests_passed,True,True,True
-2,refs/remotes/origin/import_1,0209c47c118fcaf978f6ebc5bad8a334b541de0b,b4331092d8c5d1b03e6a9807ab135ed263b52663,8204af9984280ccc7f7793f903fc0807b626bf9c,,2,2,2,5,2,True,True,True,f48eaaf883e49f3e3a1f3e1ddff64beb42c9d9bacec7d273f748baa63093bd9b,Tests_passed,052542ef8f16db238683e23556af730ee0d7c65c3ac0554d01e7ee800ca9b7c6,Tests_passed,True,True,True
+idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing
+1,refs/heads/main,4ae40d33c3b959e3a15e458eb9b0676251e36a41,48199306f02a82abdeff0c01fab1ce112126d727,488122ce6c91e157d1f49b88b79feaa083fdee5b,,True,False,Tests_passed,2252a9465319d00b974abd931cc98e1f435b4fe232b4dd61a828ad40139ec20c,True,2,1,4,2,True,Tests_passed,3782e47be673266f23cba016dc13973231429bb34e4c08a314c5b2f6c37d238f,True,2,True
+2,refs/remotes/origin/import_1,0209c47c118fcaf978f6ebc5bad8a334b541de0b,b4331092d8c5d1b03e6a9807ab135ed263b52663,8204af9984280ccc7f7793f903fc0807b626bf9c,,True,True,Tests_passed,f48eaaf883e49f3e3a1f3e1ddff64beb42c9d9bacec7d273f748baa63093bd9b,True,2,2,5,2,True,Tests_passed,052542ef8f16db238683e23556af730ee0d7c65c3ac0554d01e7ee800ca9b7c6,True,2,True
diff --git a/test/small-goal-files/merges_analyzed/mangstadt/ez-vcard.csv b/test/small-goal-files/merges_analyzed/mangstadt/ez-vcard.csv
index eb0ac4d5fa..28e484382f 100644
--- a/test/small-goal-files/merges_analyzed/mangstadt/ez-vcard.csv
+++ b/test/small-goal-files/merges_analyzed/mangstadt/ez-vcard.csv
@@ -1,14 +1,14 @@
-idx,branch_name,merge,left,right,notes,num_diff_files,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,imports_involved,non_java_involved,diff contains java file,test merge,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing
-1,refs/heads/master,8f26d88838bfe671cef10e6a832c0c6a57b42fcd,814aae2b1a8ba6e42074d282b2ff9d1af632aef3,f308a61574b9182d151aa9d0cf5fbe5818a48fb8,,5,5,1,299,30,True,True,False,False,,,,,,False
-2,refs/heads/master,0637f5fc19cf6ad79cd2c58981facc3678d5bbff,b8b0b0c8e1dff237975942022a42c6c25b9d9741,3c10bf587f097be3e2a77b0d2d556e6f9efd97b1,,7,7,1,43,12,True,True,False,False,,,,,,False
-3,refs/heads/master,633e9c677f26c1cae476d9ce43331cc30bd8f9e8,af63ebf1a441d0165bab7f6250caf0e2793b9829,22631a4817aa29b231919cb5d8c05d935386b763,a parent is the base,2,2,0,2,1,False,True,False,False,,,,,,False
-4,refs/heads/master,a927decebd50d02bff3f8c56ade565b98d0ecd4c,2380144cf35bc2c211874ac53db2d846fccffb97,6621980643544df2261bd874717839dd24b28324,,7,7,1,38,8,True,True,False,False,,,,,,False
-5,refs/heads/master,d6a31c5fece9a634b7829df08bd0afa0ef06b69a,4639361f062ee6455b88e31996743e300240e71e,4e959f00b9e3a80ea99486834b0ab164be663fdc,a parent is the base,2,2,0,2,1,False,True,False,False,,,,,,False
-6,refs/heads/master,8b26b8c56130e60347f8f20c17c3eca14b601cc1,e454bdf3e3b7d02bb95ff8a58952e70cb97dd0f9,522254f7ceb5e390cbb0904d698cb6294e081ce2,a parent is the base,4,4,0,18,3,True,True,False,False,,,,,,False
-7,refs/heads/master,63ab6b841a7aa31372315a902b98fc5b2cc3b661,ea6026ee62cc184db68d841d50d58474fcdf4862,ab2032ca9769d452d4906f51cf56ca7d983a27c4,,342,342,10,16131,2526,True,True,True,True,aa82b49dd87edb07fbe37b7c2d6801fce8db7c437d1afe8a7b2723c81806286e,Tests_passed,66055b6c4498a64239ae0e49781e086ed06ec3e58be7d9651c23c53f8c6bab6a,Tests_passed,True,True
-8,refs/heads/master,5e11fc8e2c1f5763ff6e6b37d3e750e369af7c94,b42390b2d6279bf7c23580f0f4ac517cba448cd5,dee07e7edfb332efd5d5207660248f71e96a1a0e,,51,51,1,104,50,True,True,False,False,,,,,,False
-9,refs/heads/master,bce54f56a1da7332cabdec21b26e82cd899ce82b,16b6d6cd734326e55af96146ac89594c8ed1b233,ce422afbecd67144c1e8caceaa151f80d4f8a0cc,,35,35,1,1940,161,True,True,False,False,,,,,,False
-10,refs/heads/master,f238de6e66d3e5d03715aa88dccc660d0ab89318,03bd6bf2c9873b23344b31ca7c39524ad9ee5756,c824e9fabecc54d431d4c860b95a2ad13794556c,a parent is the base,3,3,0,38,2,False,True,False,False,,,,,,False
-11,refs/heads/master,a2a632bba203ee71191e71e11058726f2f030b00,345934e15e82c9cbffb5b297aab51ad105b9ad82,541f59d09b5232b68cda87ee2abba7c62d33ee32,,4,4,1,77,4,True,True,False,False,,,,,,False
-12,refs/remotes/origin/pull/49,72e37df9ec88656844758c7303e8e1f9234295c3,24476c206b8df9f5458e2ec57fa16d3ebe23f898,64164540fa269cd1ed14f04236a88b8a3ac22dcb,,122,122,1,9540,291,True,True,False,False,,,,,,False
-13,refs/remotes/origin/pull/49,073c34351663673f4b53142bacf75033706e067f,64847e218c67593c77b0ebdefc93b5e7b4c82406,e80bea970d0b1a4ee340641f01b30b09f816eaa2,,116,116,1,10364,669,True,True,False,False,,,,,,False
+idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing
+1,refs/heads/master,8f26d88838bfe671cef10e6a832c0c6a57b42fcd,814aae2b1a8ba6e42074d282b2ff9d1af632aef3,f308a61574b9182d151aa9d0cf5fbe5818a48fb8,,False,True,True,5,30,299,1,False,5,,,,,,False
+2,refs/heads/master,0637f5fc19cf6ad79cd2c58981facc3678d5bbff,b8b0b0c8e1dff237975942022a42c6c25b9d9741,3c10bf587f097be3e2a77b0d2d556e6f9efd97b1,,False,True,True,7,12,43,1,False,7,,,,,,False
+3,refs/heads/master,633e9c677f26c1cae476d9ce43331cc30bd8f9e8,af63ebf1a441d0165bab7f6250caf0e2793b9829,22631a4817aa29b231919cb5d8c05d935386b763,a parent is the base,False,False,True,2,1,2,0,False,2,,,,,,False
+4,refs/heads/master,a927decebd50d02bff3f8c56ade565b98d0ecd4c,2380144cf35bc2c211874ac53db2d846fccffb97,6621980643544df2261bd874717839dd24b28324,,False,True,True,7,8,38,1,False,7,,,,,,False
+5,refs/heads/master,d6a31c5fece9a634b7829df08bd0afa0ef06b69a,4639361f062ee6455b88e31996743e300240e71e,4e959f00b9e3a80ea99486834b0ab164be663fdc,a parent is the base,False,False,True,2,1,2,0,False,2,,,,,,False
+6,refs/heads/master,8b26b8c56130e60347f8f20c17c3eca14b601cc1,e454bdf3e3b7d02bb95ff8a58952e70cb97dd0f9,522254f7ceb5e390cbb0904d698cb6294e081ce2,a parent is the base,False,True,True,4,3,18,0,False,4,,,,,,False
+7,refs/heads/master,63ab6b841a7aa31372315a902b98fc5b2cc3b661,ea6026ee62cc184db68d841d50d58474fcdf4862,ab2032ca9769d452d4906f51cf56ca7d983a27c4,,True,True,True,342,2526,16131,10,True,342,Tests_passed,aa82b49dd87edb07fbe37b7c2d6801fce8db7c437d1afe8a7b2723c81806286e,True,Tests_passed,66055b6c4498a64239ae0e49781e086ed06ec3e58be7d9651c23c53f8c6bab6a,True
+8,refs/heads/master,5e11fc8e2c1f5763ff6e6b37d3e750e369af7c94,b42390b2d6279bf7c23580f0f4ac517cba448cd5,dee07e7edfb332efd5d5207660248f71e96a1a0e,,False,True,True,51,50,104,1,False,51,,,,,,False
+9,refs/heads/master,bce54f56a1da7332cabdec21b26e82cd899ce82b,16b6d6cd734326e55af96146ac89594c8ed1b233,ce422afbecd67144c1e8caceaa151f80d4f8a0cc,,False,True,True,35,161,1940,1,False,35,,,,,,False
+10,refs/heads/master,f238de6e66d3e5d03715aa88dccc660d0ab89318,03bd6bf2c9873b23344b31ca7c39524ad9ee5756,c824e9fabecc54d431d4c860b95a2ad13794556c,a parent is the base,False,False,True,3,2,38,0,False,3,,,,,,False
+11,refs/heads/master,a2a632bba203ee71191e71e11058726f2f030b00,345934e15e82c9cbffb5b297aab51ad105b9ad82,541f59d09b5232b68cda87ee2abba7c62d33ee32,,False,True,True,4,4,77,1,False,4,,,,,,False
+12,refs/remotes/origin/pull/49,72e37df9ec88656844758c7303e8e1f9234295c3,24476c206b8df9f5458e2ec57fa16d3ebe23f898,64164540fa269cd1ed14f04236a88b8a3ac22dcb,,False,True,True,122,291,9540,1,False,122,,,,,,False
+13,refs/remotes/origin/pull/49,073c34351663673f4b53142bacf75033706e067f,64847e218c67593c77b0ebdefc93b5e7b4c82406,e80bea970d0b1a4ee340641f01b30b09f816eaa2,,False,True,True,116,669,10364,1,False,116,,,,,,False
diff --git a/test/small-goal-files/merges_analyzed/pedrovgs/algorithms.csv b/test/small-goal-files/merges_analyzed/pedrovgs/algorithms.csv
index c7c4a16313..521e984b26 100644
--- a/test/small-goal-files/merges_analyzed/pedrovgs/algorithms.csv
+++ b/test/small-goal-files/merges_analyzed/pedrovgs/algorithms.csv
@@ -1,21 +1,21 @@
-idx,branch_name,merge,left,right,notes,num_diff_files,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,imports_involved,non_java_involved,diff contains java file,test merge,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing
-1,refs/heads/master,44ce61beeb8bb5c5c1289db02f1da53f6bff6d8a,e121b3943958ba1558d8828db6f13c632e99f298,58129e828567fac52e821ca147feeab87a95d780,a parent is the base,3,3,0,44,17,False,True,False,False,,,,,,False
-2,refs/heads/master,e866ae7916d6b763f7d32f72f54edd735b5ea6bc,ae5dac889d19edd6c773e60420f00d4e7177f31f,4342b16e18da9082b32d5b8e9b5b6e3378461ce4,,5,5,1,116,9,False,True,False,False,,,,,,False
-3,refs/heads/master,ae5dac889d19edd6c773e60420f00d4e7177f31f,38ec459e6f163991c6f88210720dcda4fecc64e8,eb3260404e596031bc9ee037b29bd1fcbb87f625,a parent is the base,2,2,0,35,6,False,True,False,False,,,,,,False
-4,refs/heads/master,38ec459e6f163991c6f88210720dcda4fecc64e8,60d87e9a120e330eb34c9d558d0f00e52b5ce438,aa882141f26ef82107658c214ec18a799403bb57,a parent is the base,3,3,0,91,6,False,True,False,False,,,,,,False
-5,refs/heads/master,d7e0b1c03fa7cacf40b32dcfde30871e8947445a,2c4e69eb243a81ba05d24456b3cad7e8a696f630,8a1a1a7fb53732edaf17ef9876545c4bca568e05,,2,3,3,219,20,False,True,True,True,718024edbe6334028acc916e40446b4ae7cb30be97792ae8e2253bdc1112c5a4,Tests_passed,199e1e65500c8ab0fd66d837663440faf9f32711932bdf2136778923a7b0d4d3,Tests_passed,True,True
-6,refs/heads/master,60d87e9a120e330eb34c9d558d0f00e52b5ce438,bceffabe0d850ea9c67c93a9fb578d2ca8600022,9aa3611952f1715d8f5cf6404a3dad0e95bf175f,a parent is the base,2,2,0,2,1,False,True,False,False,,,,,,False
-7,refs/heads/master,bceffabe0d850ea9c67c93a9fb578d2ca8600022,247b66cb2c7792336c5d1c2c1502a55d5222c823,67360ca7159643f3a9fc20f30e164b36a4e4f859,,5,5,0,215,19,False,True,False,False,,,,,,False
-8,refs/heads/master,247b66cb2c7792336c5d1c2c1502a55d5222c823,c7c288a43e324748f1f25ee72f9639d808c70b7e,7f89b8c5fbe85848e96a0cdaffb83664588c8474,a parent is the base,3,3,0,12,6,False,True,False,False,,,,,,False
-9,refs/heads/master,c7c288a43e324748f1f25ee72f9639d808c70b7e,ffa4a6ccd332fad6dc1c5a269b3854a5a2bfff91,296f6b09446b63e8b036e4840879c2d890ae925d,a parent is the base,2,2,0,6,1,False,True,False,False,,,,,,False
-10,refs/heads/master,216529baa98d8646b192b1c6897b01d3181f2ac6,ffa4a6ccd332fad6dc1c5a269b3854a5a2bfff91,deaa316e2165940e50e4e00e83e18d27417fb642,a parent is the base,2,2,0,15,2,False,True,False,False,,,,,,False
-11,refs/heads/master,ffa4a6ccd332fad6dc1c5a269b3854a5a2bfff91,128ccf0f25f401f2218c03166a6f4ebc5ce21385,03d7c1872d5b17434fd460f7b8a0b8c9c90849f7,a parent is the base,3,3,0,18,5,False,True,False,False,,,,,,False
-12,refs/heads/master,128ccf0f25f401f2218c03166a6f4ebc5ce21385,1f8f61c50d4e36ab8677b271a58648e90a2f1b28,22ee3ce03f74349ed3b0f36bfdf1dc119e2be70b,a parent is the base,2,2,0,11,3,False,True,False,False,,,,,,False
-13,refs/heads/master,c8604d6f6d23a0cd5d3f9fac472dbf467fe11b8e,7ebdadbc657a68da22826ce3cc402e3635e80d4c,fd87cbc2cdbe813564f0a2c7e8070964220cdcc6,a parent is the base,2,2,0,7,1,False,True,False,False,,,,,,False
-14,refs/remotes/origin/pull/27,fdd92255570bf37534ba36f632773923d60e32d2,8edac208c376e88626e88a720c9166fef9588853,1a71e9f95183a089b2b72a0cb42337681594e699,,2,4,3,2,1,False,True,False,False,,,,,,False
-15,refs/remotes/origin/pull/37,6b917cc6a33eb87fec2dcdafc845177f470ca374,8ef7da30196fba8e55947acf6168d8cd4a82f2b8,68f656ff10751259284d083e8fdf8e82f7ada15f,,4,4,2,57,13,True,True,True,False,7aa5e2f53ad1560daf3a96bd8e663a929817c73938d959fa60d355658fa2e2be,Tests_failed,755c5c56e067df81d5c17ef49dc1f4e7678609ab296b9a8ab2dece46fe0e4fde,Tests_failed,False,False
-16,refs/remotes/origin/pull/37,8ef7da30196fba8e55947acf6168d8cd4a82f2b8,37e80741a853a6626a77aed38caa07f4e44d85b2,8b2e3b06185e4a111ae987db7fa01901974036cd,,6,6,1,199,12,True,True,False,False,,,,,,False
-17,refs/remotes/origin/pull/37,680f2603dc41bb7c5843b0fa342e829210611d9d,1477ce25eaad76986f50aa5b740e2c023ff31de2,879fb60972e4e83fdb7b5337db66c8afbfb95ffc,,3,3,2,60,12,False,True,True,False,bdf6e72ad28bbb283d5760e9a231b0df40640519b3e3cfd5e3f0ccda8c93fc8d,Tests_passed,1a54a2f1e9d5a185842f1ebcbb59a35d16b5d948671ad2f6eb75fc88bf0831d3,Tests_failed,False,False
-18,refs/remotes/origin/pull/37,d1279d1b59ecba7f01de8b2c1995562f92b2e255,b636ef254a97ae830baa6d783121de7890818785,9497e2f66d7af3feedd3106faa6e8b0aa6118b41,,4,4,1,159,6,True,True,False,False,,,,,,False
-19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,,3,4,4,78,10,True,True,True,True,216098fad46bb19977b73bb3104f281c803911449ff6eb9c13d600efb375ae84,Tests_passed,d80bbdd6216a68130e2bbf0e70dde5edb5e9e02e397fe38c702bc69e74fddebf,Tests_passed,True,True
-20,refs/remotes/origin/pull/73,9c8740d0e38ba93f08bfb462d16cab448a0197f1,7ebdadbc657a68da22826ce3cc402e3635e80d4c,4e2214112de23d1319ce77736547fa8900384e7c,a parent is the base,32,32,0,896,99,True,True,False,False,,,,,,False
+idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing
+1,refs/heads/master,44ce61beeb8bb5c5c1289db02f1da53f6bff6d8a,e121b3943958ba1558d8828db6f13c632e99f298,58129e828567fac52e821ca147feeab87a95d780,a parent is the base,False,False,True,3,17,44,0,False,3,,,,,,False
+2,refs/heads/master,e866ae7916d6b763f7d32f72f54edd735b5ea6bc,ae5dac889d19edd6c773e60420f00d4e7177f31f,4342b16e18da9082b32d5b8e9b5b6e3378461ce4,,False,False,True,5,9,116,1,False,5,,,,,,False
+3,refs/heads/master,ae5dac889d19edd6c773e60420f00d4e7177f31f,38ec459e6f163991c6f88210720dcda4fecc64e8,eb3260404e596031bc9ee037b29bd1fcbb87f625,a parent is the base,False,False,True,2,6,35,0,False,2,,,,,,False
+4,refs/heads/master,38ec459e6f163991c6f88210720dcda4fecc64e8,60d87e9a120e330eb34c9d558d0f00e52b5ce438,aa882141f26ef82107658c214ec18a799403bb57,a parent is the base,False,False,True,3,6,91,0,False,3,,,,,,False
+5,refs/heads/master,d7e0b1c03fa7cacf40b32dcfde30871e8947445a,2c4e69eb243a81ba05d24456b3cad7e8a696f630,8a1a1a7fb53732edaf17ef9876545c4bca568e05,,True,False,True,2,20,219,3,True,3,Tests_passed,718024edbe6334028acc916e40446b4ae7cb30be97792ae8e2253bdc1112c5a4,True,Tests_passed,199e1e65500c8ab0fd66d837663440faf9f32711932bdf2136778923a7b0d4d3,True
+6,refs/heads/master,60d87e9a120e330eb34c9d558d0f00e52b5ce438,bceffabe0d850ea9c67c93a9fb578d2ca8600022,9aa3611952f1715d8f5cf6404a3dad0e95bf175f,a parent is the base,False,False,True,2,1,2,0,False,2,,,,,,False
+7,refs/heads/master,bceffabe0d850ea9c67c93a9fb578d2ca8600022,247b66cb2c7792336c5d1c2c1502a55d5222c823,67360ca7159643f3a9fc20f30e164b36a4e4f859,,False,False,True,5,19,215,0,False,5,,,,,,False
+8,refs/heads/master,247b66cb2c7792336c5d1c2c1502a55d5222c823,c7c288a43e324748f1f25ee72f9639d808c70b7e,7f89b8c5fbe85848e96a0cdaffb83664588c8474,a parent is the base,False,False,True,3,6,12,0,False,3,,,,,,False
+9,refs/heads/master,c7c288a43e324748f1f25ee72f9639d808c70b7e,ffa4a6ccd332fad6dc1c5a269b3854a5a2bfff91,296f6b09446b63e8b036e4840879c2d890ae925d,a parent is the base,False,False,True,2,1,6,0,False,2,,,,,,False
+10,refs/heads/master,216529baa98d8646b192b1c6897b01d3181f2ac6,ffa4a6ccd332fad6dc1c5a269b3854a5a2bfff91,deaa316e2165940e50e4e00e83e18d27417fb642,a parent is the base,False,False,True,2,2,15,0,False,2,,,,,,False
+11,refs/heads/master,ffa4a6ccd332fad6dc1c5a269b3854a5a2bfff91,128ccf0f25f401f2218c03166a6f4ebc5ce21385,03d7c1872d5b17434fd460f7b8a0b8c9c90849f7,a parent is the base,False,False,True,3,5,18,0,False,3,,,,,,False
+12,refs/heads/master,128ccf0f25f401f2218c03166a6f4ebc5ce21385,1f8f61c50d4e36ab8677b271a58648e90a2f1b28,22ee3ce03f74349ed3b0f36bfdf1dc119e2be70b,a parent is the base,False,False,True,2,3,11,0,False,2,,,,,,False
+13,refs/heads/master,c8604d6f6d23a0cd5d3f9fac472dbf467fe11b8e,7ebdadbc657a68da22826ce3cc402e3635e80d4c,fd87cbc2cdbe813564f0a2c7e8070964220cdcc6,a parent is the base,False,False,True,2,1,7,0,False,2,,,,,,False
+14,refs/remotes/origin/pull/27,fdd92255570bf37534ba36f632773923d60e32d2,8edac208c376e88626e88a720c9166fef9588853,1a71e9f95183a089b2b72a0cb42337681594e699,,False,False,True,2,1,2,3,False,4,,,,,,False
+15,refs/remotes/origin/pull/37,6b917cc6a33eb87fec2dcdafc845177f470ca374,8ef7da30196fba8e55947acf6168d8cd4a82f2b8,68f656ff10751259284d083e8fdf8e82f7ada15f,,True,True,True,4,13,57,2,False,4,Tests_failed,7aa5e2f53ad1560daf3a96bd8e663a929817c73938d959fa60d355658fa2e2be,False,Tests_failed,755c5c56e067df81d5c17ef49dc1f4e7678609ab296b9a8ab2dece46fe0e4fde,False
+16,refs/remotes/origin/pull/37,8ef7da30196fba8e55947acf6168d8cd4a82f2b8,37e80741a853a6626a77aed38caa07f4e44d85b2,8b2e3b06185e4a111ae987db7fa01901974036cd,,False,True,True,6,12,199,1,False,6,,,,,,False
+17,refs/remotes/origin/pull/37,680f2603dc41bb7c5843b0fa342e829210611d9d,1477ce25eaad76986f50aa5b740e2c023ff31de2,879fb60972e4e83fdb7b5337db66c8afbfb95ffc,,True,False,True,3,12,60,2,False,3,Tests_passed,bdf6e72ad28bbb283d5760e9a231b0df40640519b3e3cfd5e3f0ccda8c93fc8d,False,Tests_failed,1a54a2f1e9d5a185842f1ebcbb59a35d16b5d948671ad2f6eb75fc88bf0831d3,False
+18,refs/remotes/origin/pull/37,d1279d1b59ecba7f01de8b2c1995562f92b2e255,b636ef254a97ae830baa6d783121de7890818785,9497e2f66d7af3feedd3106faa6e8b0aa6118b41,,False,True,True,4,6,159,1,False,4,,,,,,False
+19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,,True,True,True,3,10,78,4,True,4,Tests_passed,216098fad46bb19977b73bb3104f281c803911449ff6eb9c13d600efb375ae84,True,Tests_passed,d80bbdd6216a68130e2bbf0e70dde5edb5e9e02e397fe38c702bc69e74fddebf,True
+20,refs/remotes/origin/pull/73,9c8740d0e38ba93f08bfb462d16cab448a0197f1,7ebdadbc657a68da22826ce3cc402e3635e80d4c,4e2214112de23d1319ce77736547fa8900384e7c,a parent is the base,False,True,True,32,99,896,0,False,32,,,,,,False
diff --git a/test/small-goal-files/merges_analyzed/tntim96/jscover.csv b/test/small-goal-files/merges_analyzed/tntim96/jscover.csv
index 8bdf38c48c..7d84fa0107 100644
--- a/test/small-goal-files/merges_analyzed/tntim96/jscover.csv
+++ b/test/small-goal-files/merges_analyzed/tntim96/jscover.csv
@@ -1,29 +1,29 @@
-idx,branch_name,merge,left,right,notes,num_diff_files,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,imports_involved,non_java_involved,diff contains java file,test merge,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing
-1,refs/heads/master,e39e553da29ca3fcbb3d7eb06282eb58b78b85c7,a4292a9c149820e9101613291bff68fc240226d7,d90d5a006a58af005834ebfe553aae560f0fe2c7,a parent is the base,15,15,0,173,62,False,True,False,False,,,,,,False
-2,refs/heads/master,31361bbe2317967a9c47cfc4437e2ce706f79056,fe64f8c1071a356027e49247fd506edc23566c4d,ab9b573de54d1014b5d9822adc9d9e5cf43ba8c0,,16,16,0,76,27,False,True,False,False,,,,,,False
-3,refs/heads/master,fe64f8c1071a356027e49247fd506edc23566c4d,b9ead12fd4a28a9fd7074ad4e97128943b072828,f5cb9ece38b7bd9ae97d7a55490476b84a2336df,a parent is the base,7,7,0,74,28,False,True,False,False,,,,,,False
-4,refs/heads/master,d6f0d1998a8db93117ba9c261d3b35d03633dc59,0eca5983951641b5d0884e6ce8fd162185d0cf05,d686e46aa0582b7dbee1f0d8664d6cb4b56600ec,a parent is the base,8,8,0,33,15,False,True,False,False,,,,,,False
-5,refs/heads/master,f7a4cc17c3b97f600f5a982522100d2b0200a981,f3876ebe83363de9387bba9ec14d436e2d74d2b3,f59722bd1d3dcbf9fc183a49ee0e28ea3c42edf8,a parent is the base,8,8,0,33,15,False,True,False,False,,,,,,False
-6,refs/heads/master,526eaed4a82ee4ec9bb018e6d541c848d2bfdd0d,1adf11c82653576753af0502bfc1f63900d85780,e562b7ed71187c95e310f85e99d1325dbd49e331,a parent is the base,2,2,0,3,2,True,True,False,False,,,,,,False
-7,refs/heads/master,d780b34088c77fa4a5c7645b84d744f33ed0329f,428706a429ed1a3dca09588e989597fd9a9cb673,3a24d6bb388dfcf2696f71833f299e051e88cf1c,a parent is the base,22,22,0,615,74,True,True,False,False,,,,,,False
-8,refs/heads/master,5dc4fe25315e31fb1d6c3f58d802283634b6e37b,428706a429ed1a3dca09588e989597fd9a9cb673,26335cfc92a5aaa2df829c7ba52ac834ad1c4080,a parent is the base,10,10,0,80,30,True,True,False,False,,,,,,False
-9,refs/heads/master,9572ad5cfd2f4c20700e27f16c9e906e009d7137,c92c401a4335465b77e3bf95c47a3297fa633b5c,62d33c1ccc686ed687d04c8e874f0c36bbcfc43e,a parent is the base,2,2,0,2,1,False,True,False,False,,,,,,False
-10,refs/heads/master,9ed0dc2b5892b2b2a782435b0a5dd42f90737b97,4ba5c58dfb6bf266259b80ab2fe19057910b6dba,7d6f336981e2d3c0a3e81fc663b6e4590f8aab0b,a parent is the base,2,2,0,8,1,False,True,False,False,,,,,,False
-11,refs/heads/master,c5bb794c4ca20c492818cdc13d4c72ad57961835,d709ecd47d92508d22f60e288fbe49b36f4b5246,9539280c2e350f6104b01c366ad8557e174f46da,a parent is the base,5,5,0,32,4,False,True,False,False,,,,,,False
-12,refs/heads/master,58557bba03e3cd911b334f451d7bf20c84d54045,0eee54986010067c05972426937c3459b979a840,a4fb3645a032633128f78786d779101b46a16581,a parent is the base,7,7,0,63,8,True,True,False,False,,,,,,False
-13,refs/heads/master,5c0f3bc432afa70ae19ced28fd4655effffa643f,bf98af8c6a8559d82a24d8f6f11d5fc23d29523e,f04fe03a282ca2520de93a3f13fe4c06146e5823,a parent is the base,8,8,0,954,97,False,True,False,False,,,,,,False
-14,refs/heads/master,885ba1e858932e9715e9b27a722a129e2611caab,c5f2600a6830cb2fc14647c98a9038832d20677f,48ce23c6b5857dd37a5658eb544fad390a4e3d44,a parent is the base,7,7,0,102,21,True,True,False,False,,,,,,False
-15,refs/heads/master,ba5decc5f42a1fd11825415612eaf104b8879c9a,b387036e5d7bba871c330469f2143c242f12a0d5,95d545f377cf84ccd52b54dc0c644d18daa447a6,a parent is the base,49,49,0,10328,114,True,True,False,False,,,,,,False
-16,refs/heads/master,89ffb42fa4b9efa275282cd90369be4423441a94,5a3b21b0db2cbc45f1dccbeae832654c4b5c812e,b8d19bf433f60c02f28d046702a1ea86a157ecf6,a parent is the base,2,2,0,6,2,False,True,False,False,,,,,,False
-17,refs/heads/master,c4db946b2d372f8bde079792b1cee93ac36921d2,3d76e008055d175af8fdbb90d6c5a0ced62faf0d,4534140b2526b36b39bcdf6d417d977db7a5cb1a,a parent is the base,2,2,0,6,3,False,True,False,False,,,,,,False
-18,refs/heads/master,ea0851ac5e27d2a1a13acd2110094c46c44a849e,c0603903e4b5caeb83d2c93ceabba1e9ea59af19,e405a7f2926be3103a388e990701af1f260bc905,,4,4,1,248,9,False,True,False,False,,,,,,False
-19,refs/heads/master,2a9f0eb4e7a59587ef0fb8a9312ba5edf0078145,92d6114663b80b24d1f9bb6d282138cf6094857e,b9a2ee7526cf561aa2ff511fe9872792bd315e91,,9,9,2,181,71,False,True,False,False,,,,,,False
-20,refs/heads/master,75e03285fddc0e2510c4f20c56ac607702fc3c9a,56dc97e7850da6b5a904b57c5e288cbb89fde81d,46b585e31b43ec0d1740395b38d15fd4e4f8c60f,,15,15,2,1706,45,True,True,True,True,8cd2e5da1cc38b2042f77063db20b9c9c480d6ae2da25000586ac2cc74ed5e9e,Tests_passed,0655271b4f7b84183e4c0bf0105dc677f68858e9b294c4cdf28d57f34108ee66,Tests_passed,True,True
-21,refs/heads/master,10f916b7a0fd5953ae6f684cadd28fa87e9124e4,0fb55976f6e30ddcc8ae7af393ee0dd8d14e20e9,0256cc6b3b9f9470458ff418e6648c635c20e787,,19,19,1,903,33,True,True,False,False,,,,,,False
-22,refs/heads/master,0fb55976f6e30ddcc8ae7af393ee0dd8d14e20e9,b9f47e216af0bc46830e0cb0c6964218511bbb3f,974ce1770dc602051b320619e240603cc5358d64,,117,119,5,5476,438,True,True,True,False,e18b3ba88cc7d565b615dd8623136da1d63630febebde162e2cffc54c842eb9e,Tests_passed,04a326f5e41eef8b880988b9b468ada3cf2b34c550de24870f818d63952e637d,Tests_failed,False,False
-23,refs/heads/master,00c10a4e7f42a484209a443934c833c5970f462f,8e0ad29ac0d484db3eccc4bee791b72cc6222e4c,530d40378d2d17276f71b18f871637fea2937ecf,,5,5,1,8,4,False,True,False,False,,,,,,False
-24,refs/heads/master,adf6fd024df05daf3236ce42e8cd90b5e4448131,dca3e3596b0b880e9eb4406490488ce93bc9116a,0575f5e918deec26aba2eb2a18f0e87af679d81b,a parent is the base,2,2,0,6,2,False,True,False,False,,,,,,False
-25,refs/heads/master,3ae921c45ac9a68844bbdc1d53a8a7ca262fb6b7,8fb1d13ac9c28ccf9723a4328141816f224337b9,aec694fe670b35eb827c473f5fbaf205cd59a0ba,,12,12,1,6496,13,True,True,False,False,,,,,,False
-26,refs/heads/master,ac65c8f97187f99331093624c7829d3688a50297,fb4312ddbbf301484ff0e1243cfdf12d6a2fb840,c8937ebc236d924201af98021a50091ab0ee013a,,7,7,1,879,7,True,True,False,False,,,,,,False
-27,refs/remotes/origin/gh-pages,9217160ed01a2bb7e57cd07001fc0da20135ad21,49868943e60fdb40de33c4416aae6a8517ef3d7f,bd0c5960622a73573c9fa5fb0f356ba575c3676c,a parent is the base,3,3,0,4,2,False,True,False,False,,,,,,False
-28,refs/remotes/origin/pull/94,c905e6a5da47ddf684d6cb6b6c52a6d5cb0d2e3b,390eb1dbfc709f2b75889697a9296ffeb06424a4,2e483d3cd3abbb5b6af28ea519278f597ccded96,,37,37,2,3426,116,True,True,True,False,1c09a267f1c9a9fadc907ee6591ec27a3de2265d4d6b27f4fe6c91f7edff4aa6,Tests_failed,21c90bb9de31ea68ac17b0cb22d88ad5a1d668172ae43633e9cf5b0fdf5dd8eb,Tests_failed,False,False
+idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing
+1,refs/heads/master,e39e553da29ca3fcbb3d7eb06282eb58b78b85c7,a4292a9c149820e9101613291bff68fc240226d7,d90d5a006a58af005834ebfe553aae560f0fe2c7,a parent is the base,False,False,True,15,62,173,0,False,15,,,,,,False
+2,refs/heads/master,31361bbe2317967a9c47cfc4437e2ce706f79056,fe64f8c1071a356027e49247fd506edc23566c4d,ab9b573de54d1014b5d9822adc9d9e5cf43ba8c0,,False,False,True,16,27,76,0,False,16,,,,,,False
+3,refs/heads/master,fe64f8c1071a356027e49247fd506edc23566c4d,b9ead12fd4a28a9fd7074ad4e97128943b072828,f5cb9ece38b7bd9ae97d7a55490476b84a2336df,a parent is the base,False,False,True,7,28,74,0,False,7,,,,,,False
+4,refs/heads/master,d6f0d1998a8db93117ba9c261d3b35d03633dc59,0eca5983951641b5d0884e6ce8fd162185d0cf05,d686e46aa0582b7dbee1f0d8664d6cb4b56600ec,a parent is the base,False,False,True,8,15,33,0,False,8,,,,,,False
+5,refs/heads/master,f7a4cc17c3b97f600f5a982522100d2b0200a981,f3876ebe83363de9387bba9ec14d436e2d74d2b3,f59722bd1d3dcbf9fc183a49ee0e28ea3c42edf8,a parent is the base,False,False,True,8,15,33,0,False,8,,,,,,False
+6,refs/heads/master,526eaed4a82ee4ec9bb018e6d541c848d2bfdd0d,1adf11c82653576753af0502bfc1f63900d85780,e562b7ed71187c95e310f85e99d1325dbd49e331,a parent is the base,False,True,True,2,2,3,0,False,2,,,,,,False
+7,refs/heads/master,d780b34088c77fa4a5c7645b84d744f33ed0329f,428706a429ed1a3dca09588e989597fd9a9cb673,3a24d6bb388dfcf2696f71833f299e051e88cf1c,a parent is the base,False,True,True,22,74,615,0,False,22,,,,,,False
+8,refs/heads/master,5dc4fe25315e31fb1d6c3f58d802283634b6e37b,428706a429ed1a3dca09588e989597fd9a9cb673,26335cfc92a5aaa2df829c7ba52ac834ad1c4080,a parent is the base,False,True,True,10,30,80,0,False,10,,,,,,False
+9,refs/heads/master,9572ad5cfd2f4c20700e27f16c9e906e009d7137,c92c401a4335465b77e3bf95c47a3297fa633b5c,62d33c1ccc686ed687d04c8e874f0c36bbcfc43e,a parent is the base,False,False,True,2,1,2,0,False,2,,,,,,False
+10,refs/heads/master,9ed0dc2b5892b2b2a782435b0a5dd42f90737b97,4ba5c58dfb6bf266259b80ab2fe19057910b6dba,7d6f336981e2d3c0a3e81fc663b6e4590f8aab0b,a parent is the base,False,False,True,2,1,8,0,False,2,,,,,,False
+11,refs/heads/master,c5bb794c4ca20c492818cdc13d4c72ad57961835,d709ecd47d92508d22f60e288fbe49b36f4b5246,9539280c2e350f6104b01c366ad8557e174f46da,a parent is the base,False,False,True,5,4,32,0,False,5,,,,,,False
+12,refs/heads/master,58557bba03e3cd911b334f451d7bf20c84d54045,0eee54986010067c05972426937c3459b979a840,a4fb3645a032633128f78786d779101b46a16581,a parent is the base,False,True,True,7,8,63,0,False,7,,,,,,False
+13,refs/heads/master,5c0f3bc432afa70ae19ced28fd4655effffa643f,bf98af8c6a8559d82a24d8f6f11d5fc23d29523e,f04fe03a282ca2520de93a3f13fe4c06146e5823,a parent is the base,False,False,True,8,97,954,0,False,8,,,,,,False
+14,refs/heads/master,885ba1e858932e9715e9b27a722a129e2611caab,c5f2600a6830cb2fc14647c98a9038832d20677f,48ce23c6b5857dd37a5658eb544fad390a4e3d44,a parent is the base,False,True,True,7,21,102,0,False,7,,,,,,False
+15,refs/heads/master,ba5decc5f42a1fd11825415612eaf104b8879c9a,b387036e5d7bba871c330469f2143c242f12a0d5,95d545f377cf84ccd52b54dc0c644d18daa447a6,a parent is the base,False,True,True,49,114,10328,0,False,49,,,,,,False
+16,refs/heads/master,89ffb42fa4b9efa275282cd90369be4423441a94,5a3b21b0db2cbc45f1dccbeae832654c4b5c812e,b8d19bf433f60c02f28d046702a1ea86a157ecf6,a parent is the base,False,False,True,2,2,6,0,False,2,,,,,,False
+17,refs/heads/master,c4db946b2d372f8bde079792b1cee93ac36921d2,3d76e008055d175af8fdbb90d6c5a0ced62faf0d,4534140b2526b36b39bcdf6d417d977db7a5cb1a,a parent is the base,False,False,True,2,3,6,0,False,2,,,,,,False
+18,refs/heads/master,ea0851ac5e27d2a1a13acd2110094c46c44a849e,c0603903e4b5caeb83d2c93ceabba1e9ea59af19,e405a7f2926be3103a388e990701af1f260bc905,,False,False,True,4,9,248,1,False,4,,,,,,False
+19,refs/heads/master,2a9f0eb4e7a59587ef0fb8a9312ba5edf0078145,92d6114663b80b24d1f9bb6d282138cf6094857e,b9a2ee7526cf561aa2ff511fe9872792bd315e91,,False,False,True,9,71,181,2,False,9,,,,,,False
+20,refs/heads/master,75e03285fddc0e2510c4f20c56ac607702fc3c9a,56dc97e7850da6b5a904b57c5e288cbb89fde81d,46b585e31b43ec0d1740395b38d15fd4e4f8c60f,,True,True,True,15,45,1706,2,True,15,Tests_passed,8cd2e5da1cc38b2042f77063db20b9c9c480d6ae2da25000586ac2cc74ed5e9e,True,Tests_passed,0655271b4f7b84183e4c0bf0105dc677f68858e9b294c4cdf28d57f34108ee66,True
+21,refs/heads/master,10f916b7a0fd5953ae6f684cadd28fa87e9124e4,0fb55976f6e30ddcc8ae7af393ee0dd8d14e20e9,0256cc6b3b9f9470458ff418e6648c635c20e787,,False,True,True,19,33,903,1,False,19,,,,,,False
+22,refs/heads/master,0fb55976f6e30ddcc8ae7af393ee0dd8d14e20e9,b9f47e216af0bc46830e0cb0c6964218511bbb3f,974ce1770dc602051b320619e240603cc5358d64,,True,True,True,117,438,5476,5,False,119,Tests_passed,e18b3ba88cc7d565b615dd8623136da1d63630febebde162e2cffc54c842eb9e,False,Tests_failed,04a326f5e41eef8b880988b9b468ada3cf2b34c550de24870f818d63952e637d,False
+23,refs/heads/master,00c10a4e7f42a484209a443934c833c5970f462f,8e0ad29ac0d484db3eccc4bee791b72cc6222e4c,530d40378d2d17276f71b18f871637fea2937ecf,,False,False,True,5,4,8,1,False,5,,,,,,False
+24,refs/heads/master,adf6fd024df05daf3236ce42e8cd90b5e4448131,dca3e3596b0b880e9eb4406490488ce93bc9116a,0575f5e918deec26aba2eb2a18f0e87af679d81b,a parent is the base,False,False,True,2,2,6,0,False,2,,,,,,False
+25,refs/heads/master,3ae921c45ac9a68844bbdc1d53a8a7ca262fb6b7,8fb1d13ac9c28ccf9723a4328141816f224337b9,aec694fe670b35eb827c473f5fbaf205cd59a0ba,,False,True,True,12,13,6496,1,False,12,,,,,,False
+26,refs/heads/master,ac65c8f97187f99331093624c7829d3688a50297,fb4312ddbbf301484ff0e1243cfdf12d6a2fb840,c8937ebc236d924201af98021a50091ab0ee013a,,False,True,True,7,7,879,1,False,7,,,,,,False
+27,refs/remotes/origin/gh-pages,9217160ed01a2bb7e57cd07001fc0da20135ad21,49868943e60fdb40de33c4416aae6a8517ef3d7f,bd0c5960622a73573c9fa5fb0f356ba575c3676c,a parent is the base,False,False,True,3,2,4,0,False,3,,,,,,False
+28,refs/remotes/origin/pull/94,c905e6a5da47ddf684d6cb6b6c52a6d5cb0d2e3b,390eb1dbfc709f2b75889697a9296ffeb06424a4,2e483d3cd3abbb5b6af28ea519278f597ccded96,,True,True,True,37,116,3426,2,False,37,Tests_failed,1c09a267f1c9a9fadc907ee6591ec27a3de2265d4d6b27f4fe6c91f7edff4aa6,False,Tests_failed,21c90bb9de31ea68ac17b0cb22d88ad5a1d668172ae43633e9cf5b0fdf5dd8eb,False
diff --git a/test/small-goal-files/merges_tested/benedikt-schesch/git-hires-merge-example.csv b/test/small-goal-files/merges_tested/benedikt-schesch/git-hires-merge-example.csv
index f8c138ddc0..29aaf45098 100644
--- a/test/small-goal-files/merges_tested/benedikt-schesch/git-hires-merge-example.csv
+++ b/test/small-goal-files/merges_tested/benedikt-schesch/git-hires-merge-example.csv
@@ -1,3 +1,3 @@
-idx,branch_name,merge,left,right,notes,num_diff_files,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,imports_involved,non_java_involved,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint
-1,refs/heads/main,4ae40d33c3b959e3a15e458eb9b0676251e36a41,48199306f02a82abdeff0c01fab1ce112126d727,488122ce6c91e157d1f49b88b79feaa083fdee5b,,2,2,2,4,1,False,True,True,2252a9465319d00b974abd931cc98e1f435b4fe232b4dd61a828ad40139ec20c,Tests_passed,3782e47be673266f23cba016dc13973231429bb34e4c08a314c5b2f6c37d238f,Tests_passed,True,True,True,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,54749277742f9010b6666756eb77020e2b251b0c575b9ed96020fe650e660c3b,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Tests_passed,d04c699fb9748d42ffbbd2a94ae59e522247862c60f3dc29d7c3ed974fc47cb8,Tests_passed,37fdd5a8db81b80bee8cc5b121b9b2f70019498749193c47168e6aa4b86a02e9,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,4abab825dba02ae94f7cc664a590c7c4a57687e2b79fb78d2b92a5d190661e0f,Tests_passed,d04c699fb9748d42ffbbd2a94ae59e522247862c60f3dc29d7c3ed974fc47cb8,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19
-2,refs/remotes/origin/import_1,0209c47c118fcaf978f6ebc5bad8a334b541de0b,b4331092d8c5d1b03e6a9807ab135ed263b52663,8204af9984280ccc7f7793f903fc0807b626bf9c,,2,2,2,5,2,True,True,True,f48eaaf883e49f3e3a1f3e1ddff64beb42c9d9bacec7d273f748baa63093bd9b,Tests_passed,052542ef8f16db238683e23556af730ee0d7c65c3ac0554d01e7ee800ca9b7c6,Tests_passed,True,True,True,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,4c1e23118bc3dc9db98dd8a5d322792c1987f738893ce43bf3032e71d37615a4,Merge_failed,4e0fa6edde284105a006148092586bd2bbce067c56588f4e5c02783786563c3f,Tests_passed,371b1c88034153afe8c3292ba4698b8bea2aa4aea4495b090a68f8f0555290d5,Tests_passed,6f65953e612e19453986bb2b697a79cbab808d3dc01cd3014db987083989a175,Merge_failed,4e0fa6edde284105a006148092586bd2bbce067c56588f4e5c02783786563c3f,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,d5f2cdfd3ff568d6b5f1200f5176590d41ab3ad38f72f5e4f630e3aeb8dc83dd,Tests_passed,371b1c88034153afe8c3292ba4698b8bea2aa4aea4495b090a68f8f0555290d5,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d
+idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint
+1,refs/heads/main,4ae40d33c3b959e3a15e458eb9b0676251e36a41,48199306f02a82abdeff0c01fab1ce112126d727,488122ce6c91e157d1f49b88b79feaa083fdee5b,,True,False,Tests_passed,2252a9465319d00b974abd931cc98e1f435b4fe232b4dd61a828ad40139ec20c,True,2,1,4,2,True,Tests_passed,3782e47be673266f23cba016dc13973231429bb34e4c08a314c5b2f6c37d238f,True,2,True,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,54749277742f9010b6666756eb77020e2b251b0c575b9ed96020fe650e660c3b,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Tests_passed,d04c699fb9748d42ffbbd2a94ae59e522247862c60f3dc29d7c3ed974fc47cb8,Tests_passed,37fdd5a8db81b80bee8cc5b121b9b2f70019498749193c47168e6aa4b86a02e9,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Tests_passed,37fdd5a8db81b80bee8cc5b121b9b2f70019498749193c47168e6aa4b86a02e9,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,0af7c409dbe68e307684fc3177ad5563085b74c86666633b5f0a38573d111bda,Tests_passed,d04c699fb9748d42ffbbd2a94ae59e522247862c60f3dc29d7c3ed974fc47cb8,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19
+2,refs/remotes/origin/import_1,0209c47c118fcaf978f6ebc5bad8a334b541de0b,b4331092d8c5d1b03e6a9807ab135ed263b52663,8204af9984280ccc7f7793f903fc0807b626bf9c,,True,True,Tests_passed,f48eaaf883e49f3e3a1f3e1ddff64beb42c9d9bacec7d273f748baa63093bd9b,True,2,2,5,2,True,Tests_passed,052542ef8f16db238683e23556af730ee0d7c65c3ac0554d01e7ee800ca9b7c6,True,2,True,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,4c1e23118bc3dc9db98dd8a5d322792c1987f738893ce43bf3032e71d37615a4,Merge_failed,4e0fa6edde284105a006148092586bd2bbce067c56588f4e5c02783786563c3f,Tests_passed,371b1c88034153afe8c3292ba4698b8bea2aa4aea4495b090a68f8f0555290d5,Tests_passed,6f65953e612e19453986bb2b697a79cbab808d3dc01cd3014db987083989a175,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,4e0fa6edde284105a006148092586bd2bbce067c56588f4e5c02783786563c3f,Tests_passed,6f65953e612e19453986bb2b697a79cbab808d3dc01cd3014db987083989a175,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,c6a957d6a475b73bc2a26ea322caae33d5d0565962cdc44e40b397b31678f191,Tests_passed,371b1c88034153afe8c3292ba4698b8bea2aa4aea4495b090a68f8f0555290d5,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d
diff --git a/test/small-goal-files/merges_tested/mangstadt/ez-vcard.csv b/test/small-goal-files/merges_tested/mangstadt/ez-vcard.csv
index 27b4e427a9..a4b7394730 100644
--- a/test/small-goal-files/merges_tested/mangstadt/ez-vcard.csv
+++ b/test/small-goal-files/merges_tested/mangstadt/ez-vcard.csv
@@ -1,2 +1,2 @@
-idx,branch_name,merge,left,right,notes,num_diff_files,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,imports_involved,non_java_involved,diff contains java file,test merge,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint
-7,refs/heads/master,63ab6b841a7aa31372315a902b98fc5b2cc3b661,ea6026ee62cc184db68d841d50d58474fcdf4862,ab2032ca9769d452d4906f51cf56ca7d983a27c4,,342,342,10,16131,2526,True,True,True,True,aa82b49dd87edb07fbe37b7c2d6801fce8db7c437d1afe8a7b2723c81806286e,Tests_passed,66055b6c4498a64239ae0e49781e086ed06ec3e58be7d9651c23c53f8c6bab6a,Tests_passed,True,True,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,2eb4722f282ab563c519ff9eaa07c7fe5bb4d008eaef5edb034f712791619ed7,Tests_failed,d46e1be02785c17b203d59e5826734071ddc054a6e47461239bbc565807667e6,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,2eb4722f282ab563c519ff9eaa07c7fe5bb4d008eaef5edb034f712791619ed7,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0
+idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint
+7,refs/heads/master,63ab6b841a7aa31372315a902b98fc5b2cc3b661,ea6026ee62cc184db68d841d50d58474fcdf4862,ab2032ca9769d452d4906f51cf56ca7d983a27c4,,True,True,True,342,2526,16131,10,True,342,Tests_passed,aa82b49dd87edb07fbe37b7c2d6801fce8db7c437d1afe8a7b2723c81806286e,True,Tests_passed,66055b6c4498a64239ae0e49781e086ed06ec3e58be7d9651c23c53f8c6bab6a,True,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,2eb4722f282ab563c519ff9eaa07c7fe5bb4d008eaef5edb034f712791619ed7,Tests_failed,35753c04e2f61a849e386fbd4572bb82a26a3f151f3c20ca1be138e938ac502d,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_failed,63bdf383174120f3d6dbbd362b0f2336cd794b8e557d670c91ecff2cb168b0d9,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,2eb4722f282ab563c519ff9eaa07c7fe5bb4d008eaef5edb034f712791619ed7,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a
diff --git a/test/small-goal-files/merges_tested/pedrovgs/algorithms.csv b/test/small-goal-files/merges_tested/pedrovgs/algorithms.csv
index 5bc8496f0f..e0e5920f2d 100644
--- a/test/small-goal-files/merges_tested/pedrovgs/algorithms.csv
+++ b/test/small-goal-files/merges_tested/pedrovgs/algorithms.csv
@@ -1,3 +1,3 @@
-idx,branch_name,merge,left,right,notes,num_diff_files,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,imports_involved,non_java_involved,diff contains java file,test merge,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint
-5,refs/heads/master,d7e0b1c03fa7cacf40b32dcfde30871e8947445a,2c4e69eb243a81ba05d24456b3cad7e8a696f630,8a1a1a7fb53732edaf17ef9876545c4bca568e05,,2,3,3,219,20,False,True,True,True,718024edbe6334028acc916e40446b4ae7cb30be97792ae8e2253bdc1112c5a4,Tests_passed,199e1e65500c8ab0fd66d837663440faf9f32711932bdf2136778923a7b0d4d3,Tests_passed,True,True,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,14192423a42830e340baa41e9e304c9887717c60c76647d67d2b75beca45e4cc,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Tests_passed,e46044bafa010841cebb82e2b54234877bd9295e7f720fcdd79e2ff137cdb433,Tests_passed,06100d09fa236db95f80cbeba2d28cbc6086692d6d75031406b40d855fedac5e,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,d37c85012f27488ffb534f12b1e16e058689729b24f8193d14fddf6b3b41b31c,Tests_passed,e46044bafa010841cebb82e2b54234877bd9295e7f720fcdd79e2ff137cdb433,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7
-19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,,3,4,4,78,10,True,True,True,True,216098fad46bb19977b73bb3104f281c803911449ff6eb9c13d600efb375ae84,Tests_passed,d80bbdd6216a68130e2bbf0e70dde5edb5e9e02e397fe38c702bc69e74fddebf,Tests_passed,True,True,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,3b2f4fea6d25d8648458233fc847f7023ec6bc08720601ad7ae1efeceb450071,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,4db8343a17eae46da41b4530d1fa29a84fd0dad4bc9dc55e30d59c9e0ed076e4,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,ea1afbafefd4d14186ae487d1d6e67184e2a2c79c74607cbd873dca0bb157c39,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4
+idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint
+5,refs/heads/master,d7e0b1c03fa7cacf40b32dcfde30871e8947445a,2c4e69eb243a81ba05d24456b3cad7e8a696f630,8a1a1a7fb53732edaf17ef9876545c4bca568e05,,True,False,True,2,20,219,3,True,3,Tests_passed,718024edbe6334028acc916e40446b4ae7cb30be97792ae8e2253bdc1112c5a4,True,Tests_passed,199e1e65500c8ab0fd66d837663440faf9f32711932bdf2136778923a7b0d4d3,True,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,14192423a42830e340baa41e9e304c9887717c60c76647d67d2b75beca45e4cc,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Tests_passed,e46044bafa010841cebb82e2b54234877bd9295e7f720fcdd79e2ff137cdb433,Tests_passed,06100d09fa236db95f80cbeba2d28cbc6086692d6d75031406b40d855fedac5e,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Tests_passed,06100d09fa236db95f80cbeba2d28cbc6086692d6d75031406b40d855fedac5e,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,37a5c6dec4558e38b03c64bbb5daa0a133b242e5fc74f27bca70f4cadb1f258d,Tests_passed,e46044bafa010841cebb82e2b54234877bd9295e7f720fcdd79e2ff137cdb433,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c
+19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,,True,True,True,3,10,78,4,True,4,Tests_passed,216098fad46bb19977b73bb3104f281c803911449ff6eb9c13d600efb375ae84,True,Tests_passed,d80bbdd6216a68130e2bbf0e70dde5edb5e9e02e397fe38c702bc69e74fddebf,True,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,3b2f4fea6d25d8648458233fc847f7023ec6bc08720601ad7ae1efeceb450071,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,4db8343a17eae46da41b4530d1fa29a84fd0dad4bc9dc55e30d59c9e0ed076e4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,f1479bdc6ad8a39b416dfb3c93a0d1fd51bb3c33f9d135d07e0252cb29d7f551,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4
diff --git a/test/small-goal-files/merges_tested/tntim96/jscover.csv b/test/small-goal-files/merges_tested/tntim96/jscover.csv
index ad2f12ff91..8c4c4604c1 100644
--- a/test/small-goal-files/merges_tested/tntim96/jscover.csv
+++ b/test/small-goal-files/merges_tested/tntim96/jscover.csv
@@ -1,2 +1,2 @@
-idx,branch_name,merge,left,right,notes,num_diff_files,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,imports_involved,non_java_involved,diff contains java file,test merge,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint
-20,refs/heads/master,75e03285fddc0e2510c4f20c56ac607702fc3c9a,56dc97e7850da6b5a904b57c5e288cbb89fde81d,46b585e31b43ec0d1740395b38d15fd4e4f8c60f,,15,15,2,1706,45,True,True,True,True,8cd2e5da1cc38b2042f77063db20b9c9c480d6ae2da25000586ac2cc74ed5e9e,Tests_passed,0655271b4f7b84183e4c0bf0105dc677f68858e9b294c4cdf28d57f34108ee66,Tests_passed,True,True,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,0597b17fac27dd5503cf96febe102dfb3cf4eebd385ae84b6f1de0384a499827,Tests_failed,6895042df88cd69df58dd42da6e4f02e9e18474c89317141fa3519a06a1dd7f3,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,0597b17fac27dd5503cf96febe102dfb3cf4eebd385ae84b6f1de0384a499827,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042
+idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint
+20,refs/heads/master,75e03285fddc0e2510c4f20c56ac607702fc3c9a,56dc97e7850da6b5a904b57c5e288cbb89fde81d,46b585e31b43ec0d1740395b38d15fd4e4f8c60f,,True,True,True,15,45,1706,2,True,15,Tests_passed,8cd2e5da1cc38b2042f77063db20b9c9c480d6ae2da25000586ac2cc74ed5e9e,True,Tests_passed,0655271b4f7b84183e4c0bf0105dc677f68858e9b294c4cdf28d57f34108ee66,True,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,0597b17fac27dd5503cf96febe102dfb3cf4eebd385ae84b6f1de0384a499827,Tests_failed,6895042df88cd69df58dd42da6e4f02e9e18474c89317141fa3519a06a1dd7f3,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_failed,6895042df88cd69df58dd42da6e4f02e9e18474c89317141fa3519a06a1dd7f3,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,0597b17fac27dd5503cf96febe102dfb3cf4eebd385ae84b6f1de0384a499827,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042
diff --git a/test/small-goal-files/result.csv b/test/small-goal-files/result.csv
index cf2b59d8fb..12c60e0fad 100644
--- a/test/small-goal-files/result.csv
+++ b/test/small-goal-files/result.csv
@@ -1,7 +1,7 @@
-idx,repo-idx,merge-idx,branch_name,merge,left,right,notes,num_diff_files,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,imports_involved,non_java_involved,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,repository
-0-1,0,1,refs/heads/main,4ae40d33c3b959e3a15e458eb9b0676251e36a41,48199306f02a82abdeff0c01fab1ce112126d727,488122ce6c91e157d1f49b88b79feaa083fdee5b,,2,2,2,4,1,False,True,True,2252a9465319d00b974abd931cc98e1f435b4fe232b4dd61a828ad40139ec20c,Tests_passed,3782e47be673266f23cba016dc13973231429bb34e4c08a314c5b2f6c37d238f,Tests_passed,True,True,True,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,54749277742f9010b6666756eb77020e2b251b0c575b9ed96020fe650e660c3b,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Tests_passed,d04c699fb9748d42ffbbd2a94ae59e522247862c60f3dc29d7c3ed974fc47cb8,Tests_passed,37fdd5a8db81b80bee8cc5b121b9b2f70019498749193c47168e6aa4b86a02e9,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,4abab825dba02ae94f7cc664a590c7c4a57687e2b79fb78d2b92a5d190661e0f,Tests_passed,d04c699fb9748d42ffbbd2a94ae59e522247862c60f3dc29d7c3ed974fc47cb8,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,benedikt-schesch/git-hires-merge-example
-0-2,0,2,refs/remotes/origin/import_1,0209c47c118fcaf978f6ebc5bad8a334b541de0b,b4331092d8c5d1b03e6a9807ab135ed263b52663,8204af9984280ccc7f7793f903fc0807b626bf9c,,2,2,2,5,2,True,True,True,f48eaaf883e49f3e3a1f3e1ddff64beb42c9d9bacec7d273f748baa63093bd9b,Tests_passed,052542ef8f16db238683e23556af730ee0d7c65c3ac0554d01e7ee800ca9b7c6,Tests_passed,True,True,True,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,4c1e23118bc3dc9db98dd8a5d322792c1987f738893ce43bf3032e71d37615a4,Merge_failed,4e0fa6edde284105a006148092586bd2bbce067c56588f4e5c02783786563c3f,Tests_passed,371b1c88034153afe8c3292ba4698b8bea2aa4aea4495b090a68f8f0555290d5,Tests_passed,6f65953e612e19453986bb2b697a79cbab808d3dc01cd3014db987083989a175,Merge_failed,4e0fa6edde284105a006148092586bd2bbce067c56588f4e5c02783786563c3f,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,d5f2cdfd3ff568d6b5f1200f5176590d41ab3ad38f72f5e4f630e3aeb8dc83dd,Tests_passed,371b1c88034153afe8c3292ba4698b8bea2aa4aea4495b090a68f8f0555290d5,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,benedikt-schesch/git-hires-merge-example
-1-7,1,7,refs/heads/master,63ab6b841a7aa31372315a902b98fc5b2cc3b661,ea6026ee62cc184db68d841d50d58474fcdf4862,ab2032ca9769d452d4906f51cf56ca7d983a27c4,,342,342,10,16131,2526,True,True,True,aa82b49dd87edb07fbe37b7c2d6801fce8db7c437d1afe8a7b2723c81806286e,Tests_passed,66055b6c4498a64239ae0e49781e086ed06ec3e58be7d9651c23c53f8c6bab6a,Tests_passed,True,True,True,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,2eb4722f282ab563c519ff9eaa07c7fe5bb4d008eaef5edb034f712791619ed7,Tests_failed,d46e1be02785c17b203d59e5826734071ddc054a6e47461239bbc565807667e6,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,2eb4722f282ab563c519ff9eaa07c7fe5bb4d008eaef5edb034f712791619ed7,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,mangstadt/ez-vcard
-2-5,2,5,refs/heads/master,d7e0b1c03fa7cacf40b32dcfde30871e8947445a,2c4e69eb243a81ba05d24456b3cad7e8a696f630,8a1a1a7fb53732edaf17ef9876545c4bca568e05,,2,3,3,219,20,False,True,True,718024edbe6334028acc916e40446b4ae7cb30be97792ae8e2253bdc1112c5a4,Tests_passed,199e1e65500c8ab0fd66d837663440faf9f32711932bdf2136778923a7b0d4d3,Tests_passed,True,True,True,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,14192423a42830e340baa41e9e304c9887717c60c76647d67d2b75beca45e4cc,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Tests_passed,e46044bafa010841cebb82e2b54234877bd9295e7f720fcdd79e2ff137cdb433,Tests_passed,06100d09fa236db95f80cbeba2d28cbc6086692d6d75031406b40d855fedac5e,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,d37c85012f27488ffb534f12b1e16e058689729b24f8193d14fddf6b3b41b31c,Tests_passed,e46044bafa010841cebb82e2b54234877bd9295e7f720fcdd79e2ff137cdb433,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,pedrovgs/algorithms
-2-19,2,19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,,3,4,4,78,10,True,True,True,216098fad46bb19977b73bb3104f281c803911449ff6eb9c13d600efb375ae84,Tests_passed,d80bbdd6216a68130e2bbf0e70dde5edb5e9e02e397fe38c702bc69e74fddebf,Tests_passed,True,True,True,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,3b2f4fea6d25d8648458233fc847f7023ec6bc08720601ad7ae1efeceb450071,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,4db8343a17eae46da41b4530d1fa29a84fd0dad4bc9dc55e30d59c9e0ed076e4,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,ea1afbafefd4d14186ae487d1d6e67184e2a2c79c74607cbd873dca0bb157c39,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,pedrovgs/algorithms
-4-20,4,20,refs/heads/master,75e03285fddc0e2510c4f20c56ac607702fc3c9a,56dc97e7850da6b5a904b57c5e288cbb89fde81d,46b585e31b43ec0d1740395b38d15fd4e4f8c60f,,15,15,2,1706,45,True,True,True,8cd2e5da1cc38b2042f77063db20b9c9c480d6ae2da25000586ac2cc74ed5e9e,Tests_passed,0655271b4f7b84183e4c0bf0105dc677f68858e9b294c4cdf28d57f34108ee66,Tests_passed,True,True,True,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,0597b17fac27dd5503cf96febe102dfb3cf4eebd385ae84b6f1de0384a499827,Tests_failed,6895042df88cd69df58dd42da6e4f02e9e18474c89317141fa3519a06a1dd7f3,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,0597b17fac27dd5503cf96febe102dfb3cf4eebd385ae84b6f1de0384a499827,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,tntim96/jscover
+idx,repo-idx,merge-idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,repository
+0-1,0,1,refs/heads/main,4ae40d33c3b959e3a15e458eb9b0676251e36a41,48199306f02a82abdeff0c01fab1ce112126d727,488122ce6c91e157d1f49b88b79feaa083fdee5b,,True,False,Tests_passed,2252a9465319d00b974abd931cc98e1f435b4fe232b4dd61a828ad40139ec20c,True,2,1,4,2,True,Tests_passed,3782e47be673266f23cba016dc13973231429bb34e4c08a314c5b2f6c37d238f,True,2,True,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,54749277742f9010b6666756eb77020e2b251b0c575b9ed96020fe650e660c3b,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Tests_passed,d04c699fb9748d42ffbbd2a94ae59e522247862c60f3dc29d7c3ed974fc47cb8,Tests_passed,37fdd5a8db81b80bee8cc5b121b9b2f70019498749193c47168e6aa4b86a02e9,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Tests_passed,37fdd5a8db81b80bee8cc5b121b9b2f70019498749193c47168e6aa4b86a02e9,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,0af7c409dbe68e307684fc3177ad5563085b74c86666633b5f0a38573d111bda,Tests_passed,d04c699fb9748d42ffbbd2a94ae59e522247862c60f3dc29d7c3ed974fc47cb8,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,benedikt-schesch/git-hires-merge-example
+0-2,0,2,refs/remotes/origin/import_1,0209c47c118fcaf978f6ebc5bad8a334b541de0b,b4331092d8c5d1b03e6a9807ab135ed263b52663,8204af9984280ccc7f7793f903fc0807b626bf9c,,True,True,Tests_passed,f48eaaf883e49f3e3a1f3e1ddff64beb42c9d9bacec7d273f748baa63093bd9b,True,2,2,5,2,True,Tests_passed,052542ef8f16db238683e23556af730ee0d7c65c3ac0554d01e7ee800ca9b7c6,True,2,True,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,4c1e23118bc3dc9db98dd8a5d322792c1987f738893ce43bf3032e71d37615a4,Merge_failed,4e0fa6edde284105a006148092586bd2bbce067c56588f4e5c02783786563c3f,Tests_passed,371b1c88034153afe8c3292ba4698b8bea2aa4aea4495b090a68f8f0555290d5,Tests_passed,6f65953e612e19453986bb2b697a79cbab808d3dc01cd3014db987083989a175,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,4e0fa6edde284105a006148092586bd2bbce067c56588f4e5c02783786563c3f,Tests_passed,6f65953e612e19453986bb2b697a79cbab808d3dc01cd3014db987083989a175,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,c6a957d6a475b73bc2a26ea322caae33d5d0565962cdc44e40b397b31678f191,Tests_passed,371b1c88034153afe8c3292ba4698b8bea2aa4aea4495b090a68f8f0555290d5,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,benedikt-schesch/git-hires-merge-example
+1-7,1,7,refs/heads/master,63ab6b841a7aa31372315a902b98fc5b2cc3b661,ea6026ee62cc184db68d841d50d58474fcdf4862,ab2032ca9769d452d4906f51cf56ca7d983a27c4,,True,True,Tests_passed,aa82b49dd87edb07fbe37b7c2d6801fce8db7c437d1afe8a7b2723c81806286e,True,342,2526,16131,10,True,Tests_passed,66055b6c4498a64239ae0e49781e086ed06ec3e58be7d9651c23c53f8c6bab6a,True,342,True,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,2eb4722f282ab563c519ff9eaa07c7fe5bb4d008eaef5edb034f712791619ed7,Tests_failed,35753c04e2f61a849e386fbd4572bb82a26a3f151f3c20ca1be138e938ac502d,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_failed,63bdf383174120f3d6dbbd362b0f2336cd794b8e557d670c91ecff2cb168b0d9,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,2eb4722f282ab563c519ff9eaa07c7fe5bb4d008eaef5edb034f712791619ed7,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,mangstadt/ez-vcard
+2-5,2,5,refs/heads/master,d7e0b1c03fa7cacf40b32dcfde30871e8947445a,2c4e69eb243a81ba05d24456b3cad7e8a696f630,8a1a1a7fb53732edaf17ef9876545c4bca568e05,,True,False,Tests_passed,718024edbe6334028acc916e40446b4ae7cb30be97792ae8e2253bdc1112c5a4,True,2,20,219,3,True,Tests_passed,199e1e65500c8ab0fd66d837663440faf9f32711932bdf2136778923a7b0d4d3,True,3,True,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,14192423a42830e340baa41e9e304c9887717c60c76647d67d2b75beca45e4cc,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Tests_passed,e46044bafa010841cebb82e2b54234877bd9295e7f720fcdd79e2ff137cdb433,Tests_passed,06100d09fa236db95f80cbeba2d28cbc6086692d6d75031406b40d855fedac5e,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Tests_passed,06100d09fa236db95f80cbeba2d28cbc6086692d6d75031406b40d855fedac5e,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,37a5c6dec4558e38b03c64bbb5daa0a133b242e5fc74f27bca70f4cadb1f258d,Tests_passed,e46044bafa010841cebb82e2b54234877bd9295e7f720fcdd79e2ff137cdb433,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,pedrovgs/algorithms
+2-19,2,19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,,True,True,Tests_passed,216098fad46bb19977b73bb3104f281c803911449ff6eb9c13d600efb375ae84,True,3,10,78,4,True,Tests_passed,d80bbdd6216a68130e2bbf0e70dde5edb5e9e02e397fe38c702bc69e74fddebf,True,4,True,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,3b2f4fea6d25d8648458233fc847f7023ec6bc08720601ad7ae1efeceb450071,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,4db8343a17eae46da41b4530d1fa29a84fd0dad4bc9dc55e30d59c9e0ed076e4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,f1479bdc6ad8a39b416dfb3c93a0d1fd51bb3c33f9d135d07e0252cb29d7f551,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,pedrovgs/algorithms
+4-20,4,20,refs/heads/master,75e03285fddc0e2510c4f20c56ac607702fc3c9a,56dc97e7850da6b5a904b57c5e288cbb89fde81d,46b585e31b43ec0d1740395b38d15fd4e4f8c60f,,True,True,Tests_passed,8cd2e5da1cc38b2042f77063db20b9c9c480d6ae2da25000586ac2cc74ed5e9e,True,15,45,1706,2,True,Tests_passed,0655271b4f7b84183e4c0bf0105dc677f68858e9b294c4cdf28d57f34108ee66,True,15,True,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,0597b17fac27dd5503cf96febe102dfb3cf4eebd385ae84b6f1de0384a499827,Tests_failed,6895042df88cd69df58dd42da6e4f02e9e18474c89317141fa3519a06a1dd7f3,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_failed,6895042df88cd69df58dd42da6e4f02e9e18474c89317141fa3519a06a1dd7f3,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,0597b17fac27dd5503cf96febe102dfb3cf4eebd385ae84b6f1de0384a499827,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,tntim96/jscover
diff --git a/test/small-goal-files/tables/all/table_feature_main_summary.tex b/test/small-goal-files/tables/all/table_feature_main_summary.tex
new file mode 100644
index 0000000000..8e8bfadaea
--- /dev/null
+++ b/test/small-goal-files/tables/all/table_feature_main_summary.tex
@@ -0,0 +1,43 @@
+% Do not edit.  This file is automatically generated.
+\setlength{\tabcolsep}{.285\tabcolsep}
+\begin{tabular}{c|cc|cc|cc}
+            Tool &
+            \multicolumn{6}{c}{Merges} \\ \cline{2-7}
+            &
+            \multicolumn{2}{c|}{Correct} &
+            \multicolumn{2}{c|}{Unhandled} &
+            \multicolumn{2}{c}{Incorrect} \\
+            &
+            \multicolumn{1}{c}{Main} &
+            \multicolumn{1}{c|}{Other} &
+            \multicolumn{1}{c}{Main} &
+            \multicolumn{1}{c|}{Other} &
+            \multicolumn{1}{c}{Main} &
+            \multicolumn{1}{c}{Other} \\
+            \hline
+            Gitmerge-ort                     &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+            Gitmerge-ort-ignorespace         &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+            Gitmerge-recursive-histogram     &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+            Gitmerge-recursive-ignorespace   &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+            Gitmerge-recursive-minimal       &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+            Gitmerge-recursive-myers         &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+            Gitmerge-recursive-patience      &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+            Gitmerge-resolve                 &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+            Hires-Merge                      &  75\% &   0\% &  25\% & 100\% &   0\% &   0\% \\
+            Spork                            & 100\% &  50\% &   0\% &  50\% &   0\% &   0\% \\
+            IntelliMerge                     &  50\% &  50\% &   0\% &  50\% &  50\% &   0\% \\
+            Adjacent                         &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+            Imports                          &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+            Version Numbers                  &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+            Git-hires-merge-plus             &  75\% &   0\% &  25\% & 100\% &   0\% &   0\% \\
+            Intellimerge-plus                &  50\% &  50\% &   0\% &  50\% &  50\% &   0\% \\
+            Gitmerge-recursive-histogram-plus &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+            Gitmerge-recursive-ignorespace-plus &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+            Gitmerge-recursive-minimal-plus  &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+            Gitmerge-recursive-myers-plus    &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+            Gitmerge-recursive-patience-plus &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+            Gitmerge-resolve-plus            &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+            Spork-plus                       & 100\% &  50\% &   0\% &  50\% &   0\% &   0\% \\
+            IVn                              &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+            IVn-ignorespace                  &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+\end{tabular}
diff --git a/test/small-goal-files/tables/all/table_summary.tex b/test/small-goal-files/tables/all/table_summary.tex
new file mode 100644
index 0000000000..e0230811d2
--- /dev/null
+++ b/test/small-goal-files/tables/all/table_summary.tex
@@ -0,0 +1,34 @@
+% Do not edit.  This file is automatically generated.
+\begin{tabular}{l|c c|c c|c c|}
+        Tool & \multicolumn{6}{c|}{Merges} \\ \cline{2-7}
+        & \multicolumn{2}{c|}{Correct} &
+        \multicolumn{2}{c|}{Unhandled} &
+        \multicolumn{2}{c|}{Incorrect} \\
+        & \# & \% & \# & \% & \# & \% \\
+        \hline
+Gitmerge-ort                     &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+Gitmerge-ort-ignorespace         &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+Gitmerge-recursive-histogram     &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+Gitmerge-recursive-ignorespace   &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+Gitmerge-recursive-minimal       &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+Gitmerge-recursive-myers         &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+Gitmerge-recursive-patience      &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+Gitmerge-resolve                 &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+Hires-Merge                      &     3 &  50\% &     3 &  50\% &     0 &   0\% \\
+Spork                            &     5 &  83\% &     1 &  17\% &     0 &   0\% \\
+IntelliMerge                     &     3 &  50\% &     1 &  17\% &     2 &  33\% \\
+Adjacent                         &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+Imports                          &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+Version Numbers                  &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+Git-hires-merge-plus             &     3 &  50\% &     3 &  50\% &     0 &   0\% \\
+Intellimerge-plus                &     3 &  50\% &     1 &  17\% &     2 &  33\% \\
+Gitmerge-recursive-histogram-plus &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+Gitmerge-recursive-ignorespace-plus &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+Gitmerge-recursive-minimal-plus  &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+Gitmerge-recursive-myers-plus    &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+Gitmerge-recursive-patience-plus &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+Gitmerge-resolve-plus            &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+Spork-plus                       &     5 &  83\% &     1 &  17\% &     0 &   0\% \\
+IVn                              &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+IVn-ignorespace                  &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+\end{tabular}
diff --git a/test/small-goal-files/tables/all/tool_comparison_table.csv b/test/small-goal-files/tables/all/tool_comparison_table.csv
new file mode 100644
index 0000000000..2dfa382c2a
--- /dev/null
+++ b/test/small-goal-files/tables/all/tool_comparison_table.csv
@@ -0,0 +1,26 @@
+,gitmerge_ort,gitmerge_ort_ignorespace,gitmerge_recursive_histogram,gitmerge_recursive_ignorespace,gitmerge_recursive_minimal,gitmerge_recursive_myers,gitmerge_recursive_patience,gitmerge_resolve,git_hires_merge,spork,intellimerge,adjacent,imports,version_numbers,git_hires_merge_plus,intellimerge_plus,gitmerge_recursive_histogram_plus,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_minimal_plus,gitmerge_recursive_myers_plus,gitmerge_recursive_patience_plus,gitmerge_resolve_plus,spork_plus,ivn,ivn_ignorespace
+gitmerge_ort,-,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+gitmerge_ort_ignorespace,0,-,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+gitmerge_recursive_histogram,0,0,-,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+gitmerge_recursive_ignorespace,0,0,0,-,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+gitmerge_recursive_minimal,0,0,0,0,-,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+gitmerge_recursive_myers,0,0,0,0,0,-,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+gitmerge_recursive_patience,0,0,0,0,0,0,-,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+gitmerge_resolve,0,0,0,0,0,0,0,-,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+git_hires_merge,0,0,0,0,0,0,0,0,-,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+spork,0,0,0,0,0,0,0,0,0,-,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+intellimerge,0,0,0,0,0,0,0,0,0,0,-,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+adjacent,0,0,0,0,0,0,0,0,0,0,0,-,0,0,0,0,0,0,0,0,0,0,0,0,0
+imports,0,0,0,0,0,0,0,0,0,0,0,0,-,0,0,0,0,0,0,0,0,0,0,0,0
+version_numbers,0,0,0,0,0,0,0,0,0,0,0,0,0,-,0,0,0,0,0,0,0,0,0,0,0
+git_hires_merge_plus,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-,0,0,0,0,0,0,0,0,0,0
+intellimerge_plus,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-,0,0,0,0,0,0,0,0,0
+gitmerge_recursive_histogram_plus,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-,0,0,0,0,0,0,0,0
+gitmerge_recursive_ignorespace_plus,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-,0,0,0,0,0,0,0
+gitmerge_recursive_minimal_plus,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-,0,0,0,0,0,0
+gitmerge_recursive_myers_plus,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-,0,0,0,0,0
+gitmerge_recursive_patience_plus,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-,0,0,0,0
+gitmerge_resolve_plus,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-,0,0,0
+spork_plus,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-,0,0
+ivn,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-,0
+ivn_ignorespace,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-
diff --git a/test/small-goal-files/tables/all/tool_comparison_table.tex b/test/small-goal-files/tables/all/tool_comparison_table.tex
new file mode 100644
index 0000000000..cadbc4fd8e
--- /dev/null
+++ b/test/small-goal-files/tables/all/tool_comparison_table.tex
@@ -0,0 +1,38 @@
+% Do not edit. This file is automatically generated.
+\begin{table}[h]
+\centering
+\caption{Comparison of Merge Tool Results: Incorrect vs Unhandled}
+\label{tab:tool-comparison}
+\small
+\begin{tabular}{lrrrrrrrrrrrrrrrrrrrrrrrrr}
+\toprule
+& Gitmerge-ort & Gitmerge-ort-ignorespace & Gitmerge-recursive-histogram & Gitmerge-recursive-ignorespace & Gitmerge-recursive-minimal & Gitmerge-recursive-myers & Gitmerge-recursive-patience & Gitmerge-resolve & Hires-Merge & Spork & IntelliMerge & Adjacent & Imports & Version Numbers & Git-hires-merge-plus & Intellimerge-plus & Gitmerge-recursive-histogram-plus & Gitmerge-recursive-ignorespace-plus & Gitmerge-recursive-minimal-plus & Gitmerge-recursive-myers-plus & Gitmerge-recursive-patience-plus & Gitmerge-resolve-plus & Spork-plus & IVn & IVn-ignorespace \\
+\midrule
+Gitmerge-ort & - & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
+Gitmerge-ort-ignorespace & 0 & - & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
+Gitmerge-recursive-histogram & 0 & 0 & - & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
+Gitmerge-recursive-ignorespace & 0 & 0 & 0 & - & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
+Gitmerge-recursive-minimal & 0 & 0 & 0 & 0 & - & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
+Gitmerge-recursive-myers & 0 & 0 & 0 & 0 & 0 & - & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
+Gitmerge-recursive-patience & 0 & 0 & 0 & 0 & 0 & 0 & - & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
+Gitmerge-resolve & 0 & 0 & 0 & 0 & 0 & 0 & 0 & - & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
+Hires-Merge & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & - & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
+Spork & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & - & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
+IntelliMerge & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & - & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
+Adjacent & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & - & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
+Imports & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & - & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
+Version Numbers & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & - & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
+Git-hires-merge-plus & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & - & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
+Intellimerge-plus & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & - & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
+Gitmerge-recursive-histogram-plus & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & - & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
+Gitmerge-recursive-ignorespace-plus & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & - & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
+Gitmerge-recursive-minimal-plus & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & - & 0 & 0 & 0 & 0 & 0 & 0 \\
+Gitmerge-recursive-myers-plus & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & - & 0 & 0 & 0 & 0 & 0 \\
+Gitmerge-recursive-patience-plus & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & - & 0 & 0 & 0 & 0 \\
+Gitmerge-resolve-plus & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & - & 0 & 0 & 0 \\
+Spork-plus & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & - & 0 & 0 \\
+IVn & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & - & 0 \\
+IVn-ignorespace & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & - \\
+\bottomrule
+\end{tabular}
+\end{table}
diff --git a/test/small-goal-files/tables/git/table_feature_main_summary.tex b/test/small-goal-files/tables/git/table_feature_main_summary.tex
new file mode 100644
index 0000000000..588317e54e
--- /dev/null
+++ b/test/small-goal-files/tables/git/table_feature_main_summary.tex
@@ -0,0 +1,25 @@
+% Do not edit.  This file is automatically generated.
+\setlength{\tabcolsep}{.285\tabcolsep}
+\begin{tabular}{c|cc|cc|cc}
+            Tool &
+            \multicolumn{6}{c}{Merges} \\ \cline{2-7}
+            &
+            \multicolumn{2}{c|}{Correct} &
+            \multicolumn{2}{c|}{Unhandled} &
+            \multicolumn{2}{c}{Incorrect} \\
+            &
+            \multicolumn{1}{c}{Main} &
+            \multicolumn{1}{c|}{Other} &
+            \multicolumn{1}{c}{Main} &
+            \multicolumn{1}{c|}{Other} &
+            \multicolumn{1}{c}{Main} &
+            \multicolumn{1}{c}{Other} \\
+            \hline
+            Gitmerge-ort                     &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+            Gitmerge-ort-ignorespace         &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+            Gitmerge-recursive-histogram     &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+            Gitmerge-recursive-minimal       &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+            Gitmerge-recursive-myers         &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+            Gitmerge-recursive-patience      &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+            Gitmerge-resolve                 &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+\end{tabular}
diff --git a/test/small-goal-files/tables/git/table_summary.tex b/test/small-goal-files/tables/git/table_summary.tex
new file mode 100644
index 0000000000..099aa01b03
--- /dev/null
+++ b/test/small-goal-files/tables/git/table_summary.tex
@@ -0,0 +1,16 @@
+% Do not edit.  This file is automatically generated.
+\begin{tabular}{l|c c|c c|c c|}
+        Tool & \multicolumn{6}{c|}{Merges} \\ \cline{2-7}
+        & \multicolumn{2}{c|}{Correct} &
+        \multicolumn{2}{c|}{Unhandled} &
+        \multicolumn{2}{c|}{Incorrect} \\
+        & \# & \% & \# & \% & \# & \% \\
+        \hline
+Gitmerge-ort                     &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+Gitmerge-ort-ignorespace         &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+Gitmerge-recursive-histogram     &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+Gitmerge-recursive-minimal       &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+Gitmerge-recursive-myers         &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+Gitmerge-recursive-patience      &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+Gitmerge-resolve                 &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+\end{tabular}
diff --git a/test/small-goal-files/tables/git/tool_comparison_table.csv b/test/small-goal-files/tables/git/tool_comparison_table.csv
new file mode 100644
index 0000000000..f8a86cd9a7
--- /dev/null
+++ b/test/small-goal-files/tables/git/tool_comparison_table.csv
@@ -0,0 +1,8 @@
+,gitmerge_ort,gitmerge_ort_ignorespace,gitmerge_recursive_histogram,gitmerge_recursive_minimal,gitmerge_recursive_myers,gitmerge_recursive_patience,gitmerge_resolve
+gitmerge_ort,-,0,0,0,0,0,0
+gitmerge_ort_ignorespace,0,-,0,0,0,0,0
+gitmerge_recursive_histogram,0,0,-,0,0,0,0
+gitmerge_recursive_minimal,0,0,0,-,0,0,0
+gitmerge_recursive_myers,0,0,0,0,-,0,0
+gitmerge_recursive_patience,0,0,0,0,0,-,0
+gitmerge_resolve,0,0,0,0,0,0,-
diff --git a/test/small-goal-files/tables/git/tool_comparison_table.tex b/test/small-goal-files/tables/git/tool_comparison_table.tex
new file mode 100644
index 0000000000..9bf266cc5b
--- /dev/null
+++ b/test/small-goal-files/tables/git/tool_comparison_table.tex
@@ -0,0 +1,20 @@
+% Do not edit. This file is automatically generated.
+\begin{table}[h]
+\centering
+\caption{Comparison of Merge Tool Results: Incorrect vs Unhandled}
+\label{tab:tool-comparison}
+\small
+\begin{tabular}{lrrrrrrr}
+\toprule
+& Gitmerge-ort & Gitmerge-ort-ignorespace & Gitmerge-recursive-histogram & Gitmerge-recursive-minimal & Gitmerge-recursive-myers & Gitmerge-recursive-patience & Gitmerge-resolve \\
+\midrule
+Gitmerge-ort & - & 0 & 0 & 0 & 0 & 0 & 0 \\
+Gitmerge-ort-ignorespace & 0 & - & 0 & 0 & 0 & 0 & 0 \\
+Gitmerge-recursive-histogram & 0 & 0 & - & 0 & 0 & 0 & 0 \\
+Gitmerge-recursive-minimal & 0 & 0 & 0 & - & 0 & 0 & 0 \\
+Gitmerge-recursive-myers & 0 & 0 & 0 & 0 & - & 0 & 0 \\
+Gitmerge-recursive-patience & 0 & 0 & 0 & 0 & 0 & - & 0 \\
+Gitmerge-resolve & 0 & 0 & 0 & 0 & 0 & 0 & - \\
+\bottomrule
+\end{tabular}
+\end{table}
diff --git a/test/small-goal-files/tables/tools/table_feature_main_summary.tex b/test/small-goal-files/tables/tools/table_feature_main_summary.tex
new file mode 100644
index 0000000000..d250476c80
--- /dev/null
+++ b/test/small-goal-files/tables/tools/table_feature_main_summary.tex
@@ -0,0 +1,28 @@
+% Do not edit.  This file is automatically generated.
+\setlength{\tabcolsep}{.285\tabcolsep}
+\begin{tabular}{c|cc|cc|cc}
+            Tool &
+            \multicolumn{6}{c}{Merges} \\ \cline{2-7}
+            &
+            \multicolumn{2}{c|}{Correct} &
+            \multicolumn{2}{c|}{Unhandled} &
+            \multicolumn{2}{c}{Incorrect} \\
+            &
+            \multicolumn{1}{c}{Main} &
+            \multicolumn{1}{c|}{Other} &
+            \multicolumn{1}{c}{Main} &
+            \multicolumn{1}{c|}{Other} &
+            \multicolumn{1}{c}{Main} &
+            \multicolumn{1}{c}{Other} \\
+            \hline
+            Gitmerge-ort                     &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+            Gitmerge-ort-ignorespace         &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+            Hires-Merge                      &  75\% &   0\% &  25\% & 100\% &   0\% &   0\% \\
+            Spork                            & 100\% &  50\% &   0\% &  50\% &   0\% &   0\% \\
+            IntelliMerge                     &  50\% &  50\% &   0\% &  50\% &  50\% &   0\% \\
+            Adjacent                         &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+            Imports                          &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+            Version Numbers                  &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+            IVn                              &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+            IVn-ignorespace                  &  50\% &   0\% &  50\% & 100\% &   0\% &   0\% \\
+\end{tabular}
diff --git a/test/small-goal-files/tables/tools/table_summary.tex b/test/small-goal-files/tables/tools/table_summary.tex
new file mode 100644
index 0000000000..1f5c66506f
--- /dev/null
+++ b/test/small-goal-files/tables/tools/table_summary.tex
@@ -0,0 +1,19 @@
+% Do not edit.  This file is automatically generated.
+\begin{tabular}{l|c c|c c|c c|}
+        Tool & \multicolumn{6}{c|}{Merges} \\ \cline{2-7}
+        & \multicolumn{2}{c|}{Correct} &
+        \multicolumn{2}{c|}{Unhandled} &
+        \multicolumn{2}{c|}{Incorrect} \\
+        & \# & \% & \# & \% & \# & \% \\
+        \hline
+Gitmerge-ort                     &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+Gitmerge-ort-ignorespace         &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+Hires-Merge                      &     3 &  50\% &     3 &  50\% &     0 &   0\% \\
+Spork                            &     5 &  83\% &     1 &  17\% &     0 &   0\% \\
+IntelliMerge                     &     3 &  50\% &     1 &  17\% &     2 &  33\% \\
+Adjacent                         &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+Imports                          &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+Version Numbers                  &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+IVn                              &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+IVn-ignorespace                  &     2 &  33\% &     4 &  67\% &     0 &   0\% \\
+\end{tabular}
diff --git a/test/small-goal-files/tables/tools/tool_comparison_table.csv b/test/small-goal-files/tables/tools/tool_comparison_table.csv
new file mode 100644
index 0000000000..c870110f29
--- /dev/null
+++ b/test/small-goal-files/tables/tools/tool_comparison_table.csv
@@ -0,0 +1,11 @@
+,gitmerge_ort,gitmerge_ort_ignorespace,git_hires_merge,spork,intellimerge,adjacent,imports,version_numbers,ivn,ivn_ignorespace
+gitmerge_ort,-,0,0,0,0,0,0,0,0,0
+gitmerge_ort_ignorespace,0,-,0,0,0,0,0,0,0,0
+git_hires_merge,0,0,-,0,0,0,0,0,0,0
+spork,0,0,0,-,0,0,0,0,0,0
+intellimerge,0,0,0,0,-,0,0,0,0,0
+adjacent,0,0,0,0,0,-,0,0,0,0
+imports,0,0,0,0,0,0,-,0,0,0
+version_numbers,0,0,0,0,0,0,0,-,0,0
+ivn,0,0,0,0,0,0,0,0,-,0
+ivn_ignorespace,0,0,0,0,0,0,0,0,0,-
diff --git a/test/small-goal-files/tables/tools/tool_comparison_table.tex b/test/small-goal-files/tables/tools/tool_comparison_table.tex
new file mode 100644
index 0000000000..83615737c8
--- /dev/null
+++ b/test/small-goal-files/tables/tools/tool_comparison_table.tex
@@ -0,0 +1,23 @@
+% Do not edit. This file is automatically generated.
+\begin{table}[h]
+\centering
+\caption{Comparison of Merge Tool Results: Incorrect vs Unhandled}
+\label{tab:tool-comparison}
+\small
+\begin{tabular}{lrrrrrrrrrr}
+\toprule
+& Gitmerge-ort & Gitmerge-ort-ignorespace & Hires-Merge & Spork & IntelliMerge & Adjacent & Imports & Version Numbers & IVn & IVn-ignorespace \\
+\midrule
+Gitmerge-ort & - & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
+Gitmerge-ort-ignorespace & 0 & - & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
+Hires-Merge & 0 & 0 & - & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
+Spork & 0 & 0 & 0 & - & 0 & 0 & 0 & 0 & 0 & 0 \\
+IntelliMerge & 0 & 0 & 0 & 0 & - & 0 & 0 & 0 & 0 & 0 \\
+Adjacent & 0 & 0 & 0 & 0 & 0 & - & 0 & 0 & 0 & 0 \\
+Imports & 0 & 0 & 0 & 0 & 0 & 0 & - & 0 & 0 & 0 \\
+Version Numbers & 0 & 0 & 0 & 0 & 0 & 0 & 0 & - & 0 & 0 \\
+IVn & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & - & 0 \\
+IVn-ignorespace & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & - \\
+\bottomrule
+\end{tabular}
+\end{table}
diff --git a/test/small-goal-files/unhandled_and_failed_merges_without_intellimerge.csv b/test/small-goal-files/unhandled_and_failed_merges_without_intellimerge.csv
new file mode 100644
index 0000000000..9ea6252fce
--- /dev/null
+++ b/test/small-goal-files/unhandled_and_failed_merges_without_intellimerge.csv
@@ -0,0 +1 @@
+repo-idx,merge-idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,repository
diff --git a/test/small-goal-files/unhandled_and_failed_merges_without_intellimerge_and_spork.csv b/test/small-goal-files/unhandled_and_failed_merges_without_intellimerge_and_spork.csv
new file mode 100644
index 0000000000..9ea6252fce
--- /dev/null
+++ b/test/small-goal-files/unhandled_and_failed_merges_without_intellimerge_and_spork.csv
@@ -0,0 +1 @@
+repo-idx,merge-idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,repository