diff --git a/src/python/repo.py b/src/python/repo.py index 62b73af6f9..6e7eeb3d60 100755 --- a/src/python/repo.py +++ b/src/python/repo.py @@ -139,6 +139,7 @@ def clone_repo(repo_slug: str, repo_dir: Path) -> None: "gitmerge_resolve_plus", "git_hires_merge_plus", "spork_plus", + "mergiraf_plus", "intellimerge_plus", "adjacent_plus", "imports_plus", diff --git a/test/small-goal-files/defs.tex b/test/small-goal-files/defs.tex index ad9b8f4ba8..19da3d3d32 100644 --- a/test/small-goal-files/defs.tex +++ b/test/small-goal-files/defs.tex @@ -16,7 +16,7 @@ % Results \def\smallAverageTriesUntilPass{1.0\xspace} -\def\smallNumberofMergesWith1TriesUntilPass{86\xspace} +\def\smallNumberofMergesWith1TriesUntilPass{92\xspace} \def\smallSporkOverOrtCorrect{3\xspace} \def\smallSporkOverOrtIncorrect{0\xspace} \def\smallMainBranchMerges{4\xspace} 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 2da9de8bbd..43cfb5e81b 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_myers_ignorespace,gitmerge_recursive_myers_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,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_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,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,9162a709144430c204cda6bdd10f27f98afd581669e91bb5e11f637ea921a59d,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Tests_passed,e912cddc9e1862c3018466b17d8434ae2a960f6a52a06e167cfeefc5496a0f96,Tests_passed,b4ea8b6a0fafbc08c69026bd9ceafa6082aef1228ec3f4e50b2b185243a04c2f,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,Tests_passed,0b6e7e0c545613a9596cd82770018aa3583e1b07d72e0f8c4fe84a72ae49a958,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,e912cddc9e1862c3018466b17d8434ae2a960f6a52a06e167cfeefc5496a0f96,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd +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_myers_ignorespace,gitmerge_recursive_myers_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,mergiraf,mergiraf_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,mergiraf_plus,mergiraf_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_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,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,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,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,142615f8b56a9af45c9c7dcffee8a10827ad05b25d4710e46315e87a8d09e15e,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Tests_passed,e912cddc9e1862c3018466b17d8434ae2a960f6a52a06e167cfeefc5496a0f96,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Tests_passed,b4ea8b6a0fafbc08c69026bd9ceafa6082aef1228ec3f4e50b2b185243a04c2f,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,0b6e7e0c545613a9596cd82770018aa3583e1b07d72e0f8c4fe84a72ae49a958,Tests_passed,6f65953e612e19453986bb2b697a79cbab808d3dc01cd3014db987083989a175,Tests_passed,0b6e7e0c545613a9596cd82770018aa3583e1b07d72e0f8c4fe84a72ae49a958,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,e912cddc9e1862c3018466b17d8434ae2a960f6a52a06e167cfeefc5496a0f96,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd 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 0cd3fc20e7..04b8ea473e 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_myers_ignorespace,gitmerge_recursive_myers_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,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_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,abfe1cc848a75ef3f7f3927206a5331b47ac7d790725ad34e93b863c50a08577,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,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,e0def8abd5b44f32e51072b1e5a0cfba928c5b10b645e4d37af2b506c65f06df,Tests_failed,471187adc82ef0add7d2590a31f4f4e986424aa7182ffba52c2bc95720fcb4f3,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a +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_myers_ignorespace,gitmerge_recursive_myers_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,mergiraf,mergiraf_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,mergiraf_plus,mergiraf_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_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_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_failed,fca4fc91dfb0b83a17860b361b5e5676bda5097a8d17c5c835e7f3709aa0dc20,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,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,e0def8abd5b44f32e51072b1e5a0cfba928c5b10b645e4d37af2b506c65f06df,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_failed,ae7168f93f2b01723c586910a5219369bad17732cc6562e9ba7ac9a402296808,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,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 898b823b99..6373d2236d 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_myers_ignorespace,gitmerge_recursive_myers_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,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_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,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,5a5e4f3d791295e50eec895895eadd0107dc6dd9eae98e5d2bb4f30041d9b1af,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Tests_passed,59c2645e16ab14a566cc04a934d4edb8df443223cd9d99940f8cea9ce3f02407,Tests_passed,9dcf32f1648302dfddd693f771e7037faab44f2f30aff5115a876ddeb5df33ec,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c -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,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,4a3254e32ccd48966551c023be96c385ab53184da7cc4a5b65b9db5a1b557784,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4 +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_myers_ignorespace,gitmerge_recursive_myers_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,mergiraf,mergiraf_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,mergiraf_plus,mergiraf_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_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,Merge_failed,002bfc899d9f06a325e3ff10f36aaf6336f6321c8bf1fb7cc77889074f2bb997,Tests_passed,06100d09fa236db95f80cbeba2d28cbc6086692d6d75031406b40d855fedac5e,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,a8bc75d00e15f2ae347e022e3896aa695b3aa8c60372dbd7a7a847b07eb07c59,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Tests_passed,59c2645e16ab14a566cc04a934d4edb8df443223cd9d99940f8cea9ce3f02407,Merge_failed,002bfc899d9f06a325e3ff10f36aaf6336f6321c8bf1fb7cc77889074f2bb997,Tests_passed,9dcf32f1648302dfddd693f771e7037faab44f2f30aff5115a876ddeb5df33ec,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c +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,4b2835b55bf5bebc5a6f16b1f309d0b4a2e5ee65bdb2ef66e027297d2d6933ad,Merge_failed,4db8343a17eae46da41b4530d1fa29a84fd0dad4bc9dc55e30d59c9e0ed076e4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,8912ae6f406dc3e0bb8244c1bf97511ce03765bef8ac6d68a6fe1bbe81784d71,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,4b2835b55bf5bebc5a6f16b1f309d0b4a2e5ee65bdb2ef66e027297d2d6933ad,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,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 46aed84499..090c8ada1d 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_myers_ignorespace,gitmerge_recursive_myers_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,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_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,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,830f100d3f8e3acc5f4ac88d9075292f6a475786dd67f12bfe72d2aec8d947ae,Tests_failed,6895042df88cd69df58dd42da6e4f02e9e18474c89317141fa3519a06a1dd7f3,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8 +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_myers_ignorespace,gitmerge_recursive_myers_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,mergiraf,mergiraf_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,mergiraf_plus,mergiraf_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_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_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_failed,6895042df88cd69df58dd42da6e4f02e9e18474c89317141fa3519a06a1dd7f3,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,830f100d3f8e3acc5f4ac88d9075292f6a475786dd67f12bfe72d2aec8d947ae,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_failed,6895042df88cd69df58dd42da6e4f02e9e18474c89317141fa3519a06a1dd7f3,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8 diff --git a/test/small-goal-files/result_adjusted.csv b/test/small-goal-files/result_adjusted.csv index 51d65aaa02..1e56d8e1b2 100644 --- a/test/small-goal-files/result_adjusted.csv +++ b/test/small-goal-files/result_adjusted.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_myers_ignorespace,gitmerge_recursive_myers_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,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_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,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,9162a709144430c204cda6bdd10f27f98afd581669e91bb5e11f637ea921a59d,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Tests_passed,e912cddc9e1862c3018466b17d8434ae2a960f6a52a06e167cfeefc5496a0f96,Tests_passed,b4ea8b6a0fafbc08c69026bd9ceafa6082aef1228ec3f4e50b2b185243a04c2f,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,Tests_passed,0b6e7e0c545613a9596cd82770018aa3583e1b07d72e0f8c4fe84a72ae49a958,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,e912cddc9e1862c3018466b17d8434ae2a960f6a52a06e167cfeefc5496a0f96,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,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,abfe1cc848a75ef3f7f3927206a5331b47ac7d790725ad34e93b863c50a08577,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,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,e0def8abd5b44f32e51072b1e5a0cfba928c5b10b645e4d37af2b506c65f06df,Tests_failed,471187adc82ef0add7d2590a31f4f4e986424aa7182ffba52c2bc95720fcb4f3,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,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,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,5a5e4f3d791295e50eec895895eadd0107dc6dd9eae98e5d2bb4f30041d9b1af,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Tests_passed,59c2645e16ab14a566cc04a934d4edb8df443223cd9d99940f8cea9ce3f02407,Tests_passed,9dcf32f1648302dfddd693f771e7037faab44f2f30aff5115a876ddeb5df33ec,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,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,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,4a3254e32ccd48966551c023be96c385ab53184da7cc4a5b65b9db5a1b557784,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,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,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,830f100d3f8e3acc5f4ac88d9075292f6a475786dd67f12bfe72d2aec8d947ae,Tests_failed,6895042df88cd69df58dd42da6e4f02e9e18474c89317141fa3519a06a1dd7f3,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,tntim96/jscover +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_myers_ignorespace,gitmerge_recursive_myers_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,mergiraf,mergiraf_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,mergiraf_plus,mergiraf_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_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,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,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,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,142615f8b56a9af45c9c7dcffee8a10827ad05b25d4710e46315e87a8d09e15e,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Tests_passed,e912cddc9e1862c3018466b17d8434ae2a960f6a52a06e167cfeefc5496a0f96,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Tests_passed,b4ea8b6a0fafbc08c69026bd9ceafa6082aef1228ec3f4e50b2b185243a04c2f,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,0b6e7e0c545613a9596cd82770018aa3583e1b07d72e0f8c4fe84a72ae49a958,Tests_passed,6f65953e612e19453986bb2b697a79cbab808d3dc01cd3014db987083989a175,Tests_passed,0b6e7e0c545613a9596cd82770018aa3583e1b07d72e0f8c4fe84a72ae49a958,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,e912cddc9e1862c3018466b17d8434ae2a960f6a52a06e167cfeefc5496a0f96,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,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_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_failed,fca4fc91dfb0b83a17860b361b5e5676bda5097a8d17c5c835e7f3709aa0dc20,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,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,e0def8abd5b44f32e51072b1e5a0cfba928c5b10b645e4d37af2b506c65f06df,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_failed,ae7168f93f2b01723c586910a5219369bad17732cc6562e9ba7ac9a402296808,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,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,Merge_failed,002bfc899d9f06a325e3ff10f36aaf6336f6321c8bf1fb7cc77889074f2bb997,Tests_passed,06100d09fa236db95f80cbeba2d28cbc6086692d6d75031406b40d855fedac5e,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,a8bc75d00e15f2ae347e022e3896aa695b3aa8c60372dbd7a7a847b07eb07c59,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Tests_passed,59c2645e16ab14a566cc04a934d4edb8df443223cd9d99940f8cea9ce3f02407,Merge_failed,002bfc899d9f06a325e3ff10f36aaf6336f6321c8bf1fb7cc77889074f2bb997,Tests_passed,9dcf32f1648302dfddd693f771e7037faab44f2f30aff5115a876ddeb5df33ec,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,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,4b2835b55bf5bebc5a6f16b1f309d0b4a2e5ee65bdb2ef66e027297d2d6933ad,Merge_failed,4db8343a17eae46da41b4530d1fa29a84fd0dad4bc9dc55e30d59c9e0ed076e4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,8912ae6f406dc3e0bb8244c1bf97511ce03765bef8ac6d68a6fe1bbe81784d71,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,4b2835b55bf5bebc5a6f16b1f309d0b4a2e5ee65bdb2ef66e027297d2d6933ad,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,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_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_failed,6895042df88cd69df58dd42da6e4f02e9e18474c89317141fa3519a06a1dd7f3,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,830f100d3f8e3acc5f4ac88d9075292f6a475786dd67f12bfe72d2aec8d947ae,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_failed,6895042df88cd69df58dd42da6e4f02e9e18474c89317141fa3519a06a1dd7f3,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,tntim96/jscover diff --git a/test/small-goal-files/result_raw.csv b/test/small-goal-files/result_raw.csv index 51d65aaa02..1e56d8e1b2 100644 --- a/test/small-goal-files/result_raw.csv +++ b/test/small-goal-files/result_raw.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_myers_ignorespace,gitmerge_recursive_myers_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,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_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,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,9162a709144430c204cda6bdd10f27f98afd581669e91bb5e11f637ea921a59d,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Tests_passed,e912cddc9e1862c3018466b17d8434ae2a960f6a52a06e167cfeefc5496a0f96,Tests_passed,b4ea8b6a0fafbc08c69026bd9ceafa6082aef1228ec3f4e50b2b185243a04c2f,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,Tests_passed,0b6e7e0c545613a9596cd82770018aa3583e1b07d72e0f8c4fe84a72ae49a958,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,e912cddc9e1862c3018466b17d8434ae2a960f6a52a06e167cfeefc5496a0f96,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,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,abfe1cc848a75ef3f7f3927206a5331b47ac7d790725ad34e93b863c50a08577,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,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,e0def8abd5b44f32e51072b1e5a0cfba928c5b10b645e4d37af2b506c65f06df,Tests_failed,471187adc82ef0add7d2590a31f4f4e986424aa7182ffba52c2bc95720fcb4f3,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,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,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,5a5e4f3d791295e50eec895895eadd0107dc6dd9eae98e5d2bb4f30041d9b1af,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Tests_passed,59c2645e16ab14a566cc04a934d4edb8df443223cd9d99940f8cea9ce3f02407,Tests_passed,9dcf32f1648302dfddd693f771e7037faab44f2f30aff5115a876ddeb5df33ec,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,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,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,4a3254e32ccd48966551c023be96c385ab53184da7cc4a5b65b9db5a1b557784,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,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,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,830f100d3f8e3acc5f4ac88d9075292f6a475786dd67f12bfe72d2aec8d947ae,Tests_failed,6895042df88cd69df58dd42da6e4f02e9e18474c89317141fa3519a06a1dd7f3,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,tntim96/jscover +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_myers_ignorespace,gitmerge_recursive_myers_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,mergiraf,mergiraf_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,mergiraf_plus,mergiraf_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_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,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,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,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,142615f8b56a9af45c9c7dcffee8a10827ad05b25d4710e46315e87a8d09e15e,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Tests_passed,e912cddc9e1862c3018466b17d8434ae2a960f6a52a06e167cfeefc5496a0f96,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Tests_passed,b4ea8b6a0fafbc08c69026bd9ceafa6082aef1228ec3f4e50b2b185243a04c2f,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,0b6e7e0c545613a9596cd82770018aa3583e1b07d72e0f8c4fe84a72ae49a958,Tests_passed,6f65953e612e19453986bb2b697a79cbab808d3dc01cd3014db987083989a175,Tests_passed,0b6e7e0c545613a9596cd82770018aa3583e1b07d72e0f8c4fe84a72ae49a958,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,e912cddc9e1862c3018466b17d8434ae2a960f6a52a06e167cfeefc5496a0f96,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,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_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_failed,fca4fc91dfb0b83a17860b361b5e5676bda5097a8d17c5c835e7f3709aa0dc20,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,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,e0def8abd5b44f32e51072b1e5a0cfba928c5b10b645e4d37af2b506c65f06df,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_failed,ae7168f93f2b01723c586910a5219369bad17732cc6562e9ba7ac9a402296808,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,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,Merge_failed,002bfc899d9f06a325e3ff10f36aaf6336f6321c8bf1fb7cc77889074f2bb997,Tests_passed,06100d09fa236db95f80cbeba2d28cbc6086692d6d75031406b40d855fedac5e,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,a8bc75d00e15f2ae347e022e3896aa695b3aa8c60372dbd7a7a847b07eb07c59,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Tests_passed,59c2645e16ab14a566cc04a934d4edb8df443223cd9d99940f8cea9ce3f02407,Merge_failed,002bfc899d9f06a325e3ff10f36aaf6336f6321c8bf1fb7cc77889074f2bb997,Tests_passed,9dcf32f1648302dfddd693f771e7037faab44f2f30aff5115a876ddeb5df33ec,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,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,4b2835b55bf5bebc5a6f16b1f309d0b4a2e5ee65bdb2ef66e027297d2d6933ad,Merge_failed,4db8343a17eae46da41b4530d1fa29a84fd0dad4bc9dc55e30d59c9e0ed076e4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,8912ae6f406dc3e0bb8244c1bf97511ce03765bef8ac6d68a6fe1bbe81784d71,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,4b2835b55bf5bebc5a6f16b1f309d0b4a2e5ee65bdb2ef66e027297d2d6933ad,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,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_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_failed,6895042df88cd69df58dd42da6e4f02e9e18474c89317141fa3519a06a1dd7f3,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,830f100d3f8e3acc5f4ac88d9075292f6a475786dd67f12bfe72d2aec8d947ae,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_failed,6895042df88cd69df58dd42da6e4f02e9e18474c89317141fa3519a06a1dd7f3,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,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 index e7aba41a6f..e70a67e406 100644 --- a/test/small-goal-files/tables/all/table_feature_main_summary.tex +++ b/test/small-goal-files/tables/all/table_feature_main_summary.tex @@ -25,6 +25,7 @@ Gitmerge-resolve & 50\% & 0\% & 50\% & 100\% & 0\% & 0\% \\ Hires-Merge & 75\% & 0\% & 25\% & 100\% & 0\% & 0\% \\ Spork & 100\% & 50\% & 0\% & 50\% & 0\% & 0\% \\ + Mergiraf & 75\% & 50\% & 25\% & 50\% & 0\% & 0\% \\ IntelliMerge & 50\% & 50\% & 0\% & 50\% & 50\% & 0\% \\ Adjacent & 75\% & 50\% & 25\% & 50\% & 0\% & 0\% \\ Imports & 50\% & 50\% & 50\% & 50\% & 0\% & 0\% \\ @@ -41,6 +42,7 @@ Gitmerge-resolve-plus & 50\% & 50\% & 50\% & 50\% & 0\% & 0\% \\ Git-hires-merge-plus & 75\% & 50\% & 25\% & 50\% & 0\% & 0\% \\ Spork-plus & 100\% & 50\% & 0\% & 50\% & 0\% & 0\% \\ + Mergiraf-plus & 75\% & 50\% & 25\% & 50\% & 0\% & 0\% \\ Intellimerge-plus & 50\% & 50\% & 0\% & 50\% & 50\% & 0\% \\ Adjacent-plus & 50\% & 50\% & 50\% & 50\% & 0\% & 0\% \\ Imports-plus & 50\% & 50\% & 50\% & 50\% & 0\% & 0\% \\ diff --git a/test/small-goal-files/tables/all/table_summary.tex b/test/small-goal-files/tables/all/table_summary.tex index eca08a49f9..418b67b8be 100644 --- a/test/small-goal-files/tables/all/table_summary.tex +++ b/test/small-goal-files/tables/all/table_summary.tex @@ -16,6 +16,7 @@ Gitmerge-resolve & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ Hires-Merge & 3 & 50\% & 3 & 50\% & 0 & 0\% \\ Spork & 5 & 83\% & 1 & 17\% & 0 & 0\% \\ +Mergiraf & 4 & 67\% & 2 & 33\% & 0 & 0\% \\ IntelliMerge & 3 & 50\% & 1 & 17\% & 2 & 33\% \\ Adjacent & 4 & 67\% & 2 & 33\% & 0 & 0\% \\ Imports & 3 & 50\% & 3 & 50\% & 0 & 0\% \\ @@ -32,6 +33,7 @@ Gitmerge-resolve-plus & 3 & 50\% & 3 & 50\% & 0 & 0\% \\ Git-hires-merge-plus & 4 & 67\% & 2 & 33\% & 0 & 0\% \\ Spork-plus & 5 & 83\% & 1 & 17\% & 0 & 0\% \\ +Mergiraf-plus & 4 & 67\% & 2 & 33\% & 0 & 0\% \\ Intellimerge-plus & 3 & 50\% & 1 & 17\% & 2 & 33\% \\ Adjacent-plus & 3 & 50\% & 3 & 50\% & 0 & 0\% \\ Imports-plus & 3 & 50\% & 3 & 50\% & 0 & 0\% \\ diff --git a/test/small-goal-files/tables/all/tool_comparison_table.csv b/test/small-goal-files/tables/all/tool_comparison_table.csv index e7c991021f..b1f7205d5d 100644 --- a/test/small-goal-files/tables/all/tool_comparison_table.csv +++ b/test/small-goal-files/tables/all/tool_comparison_table.csv @@ -1,33 +1,35 @@ -,gitmerge_ort,gitmerge_ort_ignorespace,gitmerge_recursive_histogram,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_minimal,gitmerge_recursive_myers,gitmerge_recursive_patience,gitmerge_resolve,git_hires_merge,spork,intellimerge,adjacent,imports,version_numbers,ivn,ivn_ignorespace,gitmerge_ort_plus,gitmerge_ort_ignorespace_plus,gitmerge_recursive_histogram_plus,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_minimal_plus,gitmerge_recursive_myers_plus,gitmerge_recursive_patience_plus,gitmerge_resolve_plus,git_hires_merge_plus,spork_plus,intellimerge_plus,adjacent_plus,imports_plus,version_numbers_plus,ivn_plus,ivn_ignorespace_plus -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,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,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,0,0,0,0,0,0,0 -gitmerge_recursive_myers_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,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,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,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,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,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,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,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,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,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,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,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,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,0,0,0,0,0,0,0 -gitmerge_ort_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,0,0,0,0,0,0,0 -gitmerge_ort_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,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,0,0,0,0,0,0,0 -gitmerge_recursive_myers_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,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,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,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,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,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,-,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,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,0,0,-,0,0,0,0,0 -adjacent_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,0,0,0,-,0,0,0,0 -imports_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,0,0,0,0,-,0,0,0 -version_numbers_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,0,0,0,0,0,-,0,0 -ivn_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,0,0,0,0,0,0,-,0 -ivn_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,0,0,0,0,0,0,0,- +,gitmerge_ort,gitmerge_ort_ignorespace,gitmerge_recursive_histogram,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_minimal,gitmerge_recursive_myers,gitmerge_recursive_patience,gitmerge_resolve,git_hires_merge,spork,mergiraf,intellimerge,adjacent,imports,version_numbers,ivn,ivn_ignorespace,gitmerge_ort_plus,gitmerge_ort_ignorespace_plus,gitmerge_recursive_histogram_plus,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_minimal_plus,gitmerge_recursive_myers_plus,gitmerge_recursive_patience_plus,gitmerge_resolve_plus,git_hires_merge_plus,spork_plus,mergiraf_plus,intellimerge_plus,adjacent_plus,imports_plus,version_numbers_plus,ivn_plus,ivn_ignorespace_plus +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,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,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,0,0,0,0,0,0,0,0,0 +gitmerge_recursive_myers_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,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,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,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,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,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,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,0,0,0,0,0,0,0,0,0 +mergiraf,0,0,0,0,0,0,0,0,0,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,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,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,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,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,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,0,0,0,0,0,0,0,0,0 +gitmerge_ort_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,0,0,0,0,0,0,0,0,0 +gitmerge_ort_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,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,0,0,0,0,0,0,0,0,0 +gitmerge_recursive_myers_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,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,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,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,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,-,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,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,0,0,-,0,0,0,0,0,0,0 +mergiraf_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,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,0,0,0,0,-,0,0,0,0,0 +adjacent_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,0,0,0,0,0,-,0,0,0,0 +imports_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,0,0,0,0,0,0,-,0,0,0 +version_numbers_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,0,0,0,0,0,0,0,-,0,0 +ivn_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,0,0,0,0,0,0,0,0,-,0 +ivn_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,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 index 8ee90d8877..760b90c441 100644 --- a/test/small-goal-files/tables/all/tool_comparison_table.tex +++ b/test/small-goal-files/tables/all/tool_comparison_table.tex @@ -4,42 +4,44 @@ \caption{Comparison of Merge Tool Results: Incorrect vs Unhandled} \label{tab:tool-comparison} \small -\begin{tabular}{lrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr} +\begin{tabular}{lrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr} \toprule -& Gitmerge-ort & Gitmerge-ort-ignorespace & Gitmerge-recursive-histogram & Gitmerge-recursive-myers-ignorespace & Gitmerge-recursive-minimal & Gitmerge-recursive-myers & Gitmerge-recursive-patience & Gitmerge-resolve & Hires-Merge & Spork & IntelliMerge & Adjacent & Imports & Version Numbers & IVn & IVn-ignorespace & Gitmerge-ort-plus & Gitmerge-ort-ignorespace-plus & Gitmerge-recursive-histogram-plus & Gitmerge-recursive-myers-ignorespace-plus & Gitmerge-recursive-minimal-plus & Gitmerge-recursive-myers-plus & Gitmerge-recursive-patience-plus & Gitmerge-resolve-plus & Git-hires-merge-plus & Spork-plus & Intellimerge-plus & Adjacent-plus & Imports-plus & Version-numbers-plus & Ivn-plus & Ivn-ignorespace-plus \\ +& Gitmerge-ort & Gitmerge-ort-ignorespace & Gitmerge-recursive-histogram & Gitmerge-recursive-myers-ignorespace & Gitmerge-recursive-minimal & Gitmerge-recursive-myers & Gitmerge-recursive-patience & Gitmerge-resolve & Hires-Merge & Spork & Mergiraf & IntelliMerge & Adjacent & Imports & Version Numbers & IVn & IVn-ignorespace & Gitmerge-ort-plus & Gitmerge-ort-ignorespace-plus & Gitmerge-recursive-histogram-plus & Gitmerge-recursive-myers-ignorespace-plus & Gitmerge-recursive-minimal-plus & Gitmerge-recursive-myers-plus & Gitmerge-recursive-patience-plus & Gitmerge-resolve-plus & Git-hires-merge-plus & Spork-plus & Mergiraf-plus & Intellimerge-plus & Adjacent-plus & Imports-plus & Version-numbers-plus & Ivn-plus & Ivn-ignorespace-plus \\ \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 & 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 & 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 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\ -Gitmerge-recursive-myers-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 & 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 & 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 & 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 & 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 & 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 & 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 & 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 & 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 & 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 & 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 & 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 & 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 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\ -Gitmerge-ort-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 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\ -Gitmerge-ort-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 & 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 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\ -Gitmerge-recursive-myers-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 & 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 & 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 & 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 & 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 & 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 & - & 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 & 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 & 0 & 0 & - & 0 & 0 & 0 & 0 & 0 \\ -Adjacent-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 & 0 & 0 & 0 & - & 0 & 0 & 0 & 0 \\ -Imports-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 & 0 & 0 & 0 & 0 & - & 0 & 0 & 0 \\ -Version-numbers-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 & 0 & 0 & 0 & 0 & 0 & - & 0 & 0 \\ -Ivn-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 & 0 & 0 & 0 & 0 & 0 & 0 & - & 0 \\ -Ivn-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 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & - \\ +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 & 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 & 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 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\ +Gitmerge-recursive-myers-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 & 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 & 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 & 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 & 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 & 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 & 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 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\ +Mergiraf & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 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 & 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 & 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 & 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 & 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 & 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 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\ +Gitmerge-ort-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 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\ +Gitmerge-ort-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 & 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 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\ +Gitmerge-recursive-myers-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 & 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 & 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 & 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 & 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 & - & 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 & 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 & 0 & 0 & - & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\ +Mergiraf-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 & 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 & 0 & 0 & 0 & 0 & - & 0 & 0 & 0 & 0 & 0 \\ +Adjacent-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 & 0 & 0 & 0 & 0 & 0 & - & 0 & 0 & 0 & 0 \\ +Imports-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 & 0 & 0 & 0 & 0 & 0 & 0 & - & 0 & 0 & 0 \\ +Version-numbers-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 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & - & 0 & 0 \\ +Ivn-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 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & - & 0 \\ +Ivn-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 & 0 & 0 & 0 & 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 index 7d17e0c574..bad71a4ed5 100644 --- a/test/small-goal-files/tables/tools/table_feature_main_summary.tex +++ b/test/small-goal-files/tables/tools/table_feature_main_summary.tex @@ -19,6 +19,7 @@ Gitmerge-ort-ignorespace & 50\% & 0\% & 50\% & 100\% & 0\% & 0\% \\ Hires-Merge & 75\% & 0\% & 25\% & 100\% & 0\% & 0\% \\ Spork & 100\% & 50\% & 0\% & 50\% & 0\% & 0\% \\ + Mergiraf & 75\% & 50\% & 25\% & 50\% & 0\% & 0\% \\ IntelliMerge & 50\% & 50\% & 0\% & 50\% & 50\% & 0\% \\ Adjacent & 75\% & 50\% & 25\% & 50\% & 0\% & 0\% \\ Imports & 50\% & 50\% & 50\% & 50\% & 0\% & 0\% \\ diff --git a/test/small-goal-files/tables/tools/table_summary.tex b/test/small-goal-files/tables/tools/table_summary.tex index 537a5380a9..6154fef86b 100644 --- a/test/small-goal-files/tables/tools/table_summary.tex +++ b/test/small-goal-files/tables/tools/table_summary.tex @@ -10,6 +10,7 @@ Gitmerge-ort-ignorespace & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ Hires-Merge & 3 & 50\% & 3 & 50\% & 0 & 0\% \\ Spork & 5 & 83\% & 1 & 17\% & 0 & 0\% \\ +Mergiraf & 4 & 67\% & 2 & 33\% & 0 & 0\% \\ IntelliMerge & 3 & 50\% & 1 & 17\% & 2 & 33\% \\ Adjacent & 4 & 67\% & 2 & 33\% & 0 & 0\% \\ Imports & 3 & 50\% & 3 & 50\% & 0 & 0\% \\ diff --git a/test/small-goal-files/tables/tools/tool_comparison_table.csv b/test/small-goal-files/tables/tools/tool_comparison_table.csv index c870110f29..14f4e11213 100644 --- a/test/small-goal-files/tables/tools/tool_comparison_table.csv +++ b/test/small-goal-files/tables/tools/tool_comparison_table.csv @@ -1,11 +1,12 @@ -,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,- +,gitmerge_ort,gitmerge_ort_ignorespace,git_hires_merge,spork,mergiraf,intellimerge,adjacent,imports,version_numbers,ivn,ivn_ignorespace +gitmerge_ort,-,0,0,0,0,0,0,0,0,0,0 +gitmerge_ort_ignorespace,0,-,0,0,0,0,0,0,0,0,0 +git_hires_merge,0,0,-,0,0,0,0,0,0,0,0 +spork,0,0,0,-,0,0,0,0,0,0,0 +mergiraf,0,0,0,0,-,0,0,0,0,0,0 +intellimerge,0,0,0,0,0,-,0,0,0,0,0 +adjacent,0,0,0,0,0,0,-,0,0,0,0 +imports,0,0,0,0,0,0,0,-,0,0,0 +version_numbers,0,0,0,0,0,0,0,0,-,0,0 +ivn,0,0,0,0,0,0,0,0,0,-,0 +ivn_ignorespace,0,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 index 83615737c8..3757ac02d6 100644 --- a/test/small-goal-files/tables/tools/tool_comparison_table.tex +++ b/test/small-goal-files/tables/tools/tool_comparison_table.tex @@ -4,20 +4,21 @@ \caption{Comparison of Merge Tool Results: Incorrect vs Unhandled} \label{tab:tool-comparison} \small -\begin{tabular}{lrrrrrrrrrr} +\begin{tabular}{lrrrrrrrrrrr} \toprule -& Gitmerge-ort & Gitmerge-ort-ignorespace & Hires-Merge & Spork & IntelliMerge & Adjacent & Imports & Version Numbers & IVn & IVn-ignorespace \\ +& Gitmerge-ort & Gitmerge-ort-ignorespace & Hires-Merge & Spork & Mergiraf & 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 & - \\ +Gitmerge-ort & - & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\ +Gitmerge-ort-ignorespace & 0 & - & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\ +Hires-Merge & 0 & 0 & - & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\ +Spork & 0 & 0 & 0 & - & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\ +Mergiraf & 0 & 0 & 0 & 0 & - & 0 & 0 & 0 & 0 & 0 & 0 \\ +IntelliMerge & 0 & 0 & 0 & 0 & 0 & - & 0 & 0 & 0 & 0 & 0 \\ +Adjacent & 0 & 0 & 0 & 0 & 0 & 0 & - & 0 & 0 & 0 & 0 \\ +Imports & 0 & 0 & 0 & 0 & 0 & 0 & 0 & - & 0 & 0 & 0 \\ +Version Numbers & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & - & 0 & 0 \\ +IVn & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & - & 0 \\ +IVn-ignorespace & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & - \\ \bottomrule \end{tabular} \end{table} diff --git a/wget-log b/wget-log new file mode 100644 index 0000000000..bc5c92403c --- /dev/null +++ b/wget-log @@ -0,0 +1,56 @@ +--2024-11-14 12:09:05-- https://codeberg.org/mergiraf/mergiraf/releases/download/v0.3.0/mergiraf_x86_64-unknown-linux-gnu.tar.gz +Resolving codeberg.org (codeberg.org)... 2001:67c:1401:20f0::1, 217.197.91.145 +Connecting to codeberg.org (codeberg.org)|2001:67c:1401:20f0::1|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 2404117 (2.3M) [application/octet-stream] +Saving to: ‘/scratch/scheschb/AST-Merging-Evaluation/bin/mergiraf.tar.gz’ + + 0K .......... .......... .......... .......... .......... 2% 174K 13s + 50K .......... .......... .......... .......... .......... 4% 349K 10s + 100K .......... .......... .......... .......... .......... 6% 31.9M 6s + 150K .......... .......... .......... .......... .......... 8% 371K 6s + 200K .......... .......... .......... .......... .......... 10% 8.82M 5s + 250K .......... .......... .......... .......... .......... 12% 31.5M 4s + 300K .......... .......... .......... .......... .......... 14% 1.50M 3s + 350K .......... .......... .......... .......... .......... 17% 491K 3s + 400K .......... .......... .......... .......... .......... 19% 23.5M 3s + 450K .......... .......... .......... .......... .......... 21% 13.2M 3s + 500K .......... .......... .......... .......... .......... 23% 42.4M 2s + 550K .......... .......... .......... .......... .......... 25% 42.2M 2s + 600K .......... .......... .......... .......... .......... 27% 42.0M 2s + 650K .......... .......... .......... .......... .......... 29% 1.62M 2s + 700K .......... .......... .......... .......... .......... 31% 53.6M 2s + 750K .......... .......... .......... .......... .......... 34% 499K 2s + 800K .......... .......... .......... .......... .......... 36% 42.8M 1s + 850K .......... .......... .......... .......... .......... 38% 64.3M 1s + 900K .......... .......... .......... .......... .......... 40% 16.5M 1s + 950K .......... .......... .......... .......... .......... 42% 50.1M 1s + 1000K .......... .......... .......... .......... .......... 44% 66.8M 1s + 1050K .......... .......... .......... .......... .......... 46% 62.3M 1s + 1100K .......... .......... .......... .......... .......... 48% 63.8M 1s + 1150K .......... .......... .......... .......... .......... 51% 87.2M 1s + 1200K .......... .......... .......... .......... .......... 53% 84.3M 1s + 1250K .......... .......... .......... .......... .......... 55% 126M 1s + 1300K .......... .......... .......... .......... .......... 57% 84.1M 1s + 1350K .......... .......... .......... .......... .......... 59% 125M 1s + 1400K .......... .......... .......... .......... .......... 61% 1.66M 1s + 1450K .......... .......... .......... .......... .......... 63% 63.4M 1s + 1500K .......... .......... .......... .......... .......... 66% 500K 1s + 1550K .......... .......... .......... .......... .......... 68% 119M 0s + 1600K .......... .......... .......... .......... .......... 70% 132M 0s + 1650K .......... .......... .......... .......... .......... 72% 88.1M 0s + 1700K .......... .......... .......... .......... .......... 74% 61.6M 0s + 1750K .......... .......... .......... .......... .......... 76% 83.9M 0s + 1800K .......... .......... .......... .......... .......... 78% 88.1M 0s + 1850K .......... .......... .......... .......... .......... 80% 86.6M 0s + 1900K .......... .......... .......... .......... .......... 83% 29.6M 0s + 1950K .......... .......... .......... .......... .......... 85% 128M 0s + 2000K .......... .......... .......... .......... .......... 87% 126M 0s + 2050K .......... .......... .......... .......... .......... 89% 120M 0s + 2100K .......... .......... .......... .......... .......... 91% 85.5M 0s + 2150K .......... .......... .......... .......... .......... 93% 134M 0s + 2200K .......... .......... .......... .......... .......... 95% 121M 0s + 2250K .......... .......... .......... .......... .......... 97% 82.8M 0s + 2300K .......... .......... .......... .......... ....... 100% 125M=1.0s + +2024-11-14 12:09:07 (2.29 MB/s) - ‘/scratch/scheschb/AST-Merging-Evaluation/bin/mergiraf.tar.gz’ saved [2404117/2404117] diff --git a/wget-log.1 b/wget-log.1 new file mode 100644 index 0000000000..d306f6ea35 --- /dev/null +++ b/wget-log.1 @@ -0,0 +1,57 @@ +--2024-11-14 12:09:05-- https://codeberg.org/mergiraf/mergiraf/releases/download/v0.3.0/mergiraf_x86_64-unknown-linux-gnu.tar.gz +Resolving codeberg.org (codeberg.org)... 2001:67c:1401:20f0::1, 217.197.91.145 +Connecting to codeberg.org (codeberg.org)|2001:67c:1401:20f0::1|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 2404117 (2.3M) [application/octet-stream] +Saving to: ‘/scratch/scheschb/AST-Merging-Evaluation/bin/mergiraf.tar.gz’ + + 0K .......... .......... .......... .......... .......... 2% 176K 13s + 50K .......... .......... .......... .......... .......... 4% 355K 10s + 100K .......... .......... .......... .......... .......... 6% 32.0M 6s + 150K .......... .......... .......... .......... .......... 8% 426K 6s + 200K .......... .......... .......... .......... .......... 10% 2.16M 5s + 250K .......... .......... .......... .......... .......... 12% 28.2M 4s + 300K .......... .......... .......... .......... .......... 14% 31.7M 3s + 350K .......... .......... .......... .......... .......... 17% 435K 3s + 400K .......... .......... .......... .......... .......... 19% 27.7M 3s + 450K .......... .......... .......... .......... .......... 21% 2.22M 3s + 500K .......... .......... .......... .......... .......... 23% 37.1M 2s + 550K .......... .......... .......... .......... .......... 25% 43.5M 2s + 600K .......... .......... .......... .......... .......... 27% 49.8M 2s + 650K .......... .......... .......... .......... .......... 29% 51.9M 2s + 700K .......... .......... .......... .......... .......... 31% 51.7M 2s + 750K .......... .......... .......... .......... .......... 34% 1.33M 1s + 800K .......... .......... .......... .......... .......... 36% 661K 1s + 850K .......... .......... .......... .......... .......... 38% 50.9M 1s + 900K .......... .......... .......... .......... .......... 40% 63.1M 1s + 950K .......... .......... .......... .......... .......... 42% 2.30M 1s + 1000K .......... .......... .......... .......... .......... 44% 64.2M 1s + 1050K .......... .......... .......... .......... .......... 46% 51.4M 1s + 1100K .......... .......... .......... .......... .......... 48% 63.2M 1s + 1150K .......... .......... .......... .......... .......... 51% 119M 1s + 1200K .......... .......... .......... .......... .......... 53% 88.1M 1s + 1250K .......... .......... .......... .......... .......... 55% 112M 1s + 1300K .......... .......... .......... .......... .......... 57% 90.6M 1s + 1350K .......... .......... .......... .......... .......... 59% 85.9M 1s + 1400K .......... .......... .......... .......... .......... 61% 128M 1s + 1450K .......... .......... .......... .......... .......... 63% 84.7M 0s + 1500K .......... .......... .......... .......... .......... 66% 87.3M 0s + 1550K .......... .......... .......... .......... .......... 68% 1.37M 0s + 1600K .......... .......... .......... .......... .......... 70% 51.1M 0s + 1650K .......... .......... .......... .......... .......... 72% 668K 0s + 1700K .......... .......... .......... .......... .......... 74% 92.8M 0s + 1750K .......... .......... .......... .......... .......... 76% 81.0M 0s + 1800K .......... .......... .......... .......... .......... 78% 88.3M 0s + 1850K .......... .......... .......... .......... .......... 80% 86.3M 0s + 1900K .......... .......... .......... .......... .......... 83% 2.33M 0s + 1950K .......... .......... .......... .......... .......... 85% 127M 0s + 2000K .......... .......... .......... .......... .......... 87% 118M 0s + 2050K .......... .......... .......... .......... .......... 89% 87.0M 0s + 2100K .......... .......... .......... .......... .......... 91% 124M 0s + 2150K .......... .......... .......... .......... .......... 93% 88.3M 0s + 2200K .......... .......... .......... .......... .......... 95% 123M 0s + 2250K .......... .......... .......... .......... .......... 97% 86.0M 0s + 2300K .......... .......... .......... .......... ....... 100% 242M=1.0s + +utime(/scratch/scheschb/AST-Merging-Evaluation/bin/mergiraf.tar.gz): No such file or directory +2024-11-14 12:09:07 (2.31 MB/s) - ‘/scratch/scheschb/AST-Merging-Evaluation/bin/mergiraf.tar.gz’ saved [2404117/2404117]