-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
50bb829
commit ae9f644
Showing
1,528 changed files
with
10,543 additions
and
10,543 deletions.
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,plumelib_ort_adjacent,plumelib_ort_adjacent_merge_fingerprint,plumelib_ort_imports,plumelib_ort_imports_merge_fingerprint,plumelib_ort_version_number,plumelib_ort_version_number_merge_fingerprint | ||
2,refs/heads/master,a929486b0e7bf006bd2a192329a16f2b15ab95f1,616fcdc19d53152ca885ab8beac68d3073ec6d8b,9b2402b47af713de3b0b96989fc38023f2a86767,,True,,True,33,128,,13,True,38,Tests_passed,55c9532af6b46b42cc0e3b9bbe94a8e6ae05a63db240c02401dc2a25c48b754d,True,Tests_passed,56ed3a972e2f4eb451c8181a8d32284d9afc19069ceddbea6fe0fb182111f19d,True,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,9af71d83df0c75f64da9a47aea44d323e9128c8c73e5f9f8ae750c7da72f805d,Merge_failed,aa9af827534520af2d7cef78542ceced14f4d4ec4fc62d5be033d9b138f1e691,Merge_failed,52b4176766657a174de8dd4273c79e4f37bb546e703906396cf9a50f323abe81,Merge_failed,488e4d658c9337dfc60cf550211ff89375362a23724d865f413025afc6dffa98,Merge_failed,c9f6b0ffb9a7895527358c762598a7c04b0398cc7324ccfd04f2fea1b219977a,Merge_failed,0b904e22ed47f5f0845746df445d7c1359ef411ad86e0dcae6351d78d355d90d,Merge_failed,0b904e22ed47f5f0845746df445d7c1359ef411ad86e0dcae6351d78d355d90d,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,0b904e22ed47f5f0845746df445d7c1359ef411ad86e0dcae6351d78d355d90d,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f | ||
2,refs/heads/master,a929486b0e7bf006bd2a192329a16f2b15ab95f1,616fcdc19d53152ca885ab8beac68d3073ec6d8b,9b2402b47af713de3b0b96989fc38023f2a86767,,True,,True,33,128,,13,True,38,Tests_passed,55c9532af6b46b42cc0e3b9bbe94a8e6ae05a63db240c02401dc2a25c48b754d,True,Tests_passed,56ed3a972e2f4eb451c8181a8d32284d9afc19069ceddbea6fe0fb182111f19d,True,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,c1005244cea23c90b85f9ed83eacf23dd49eb4e3eb00850a7e7004672e125956,Merge_failed,52b4176766657a174de8dd4273c79e4f37bb546e703906396cf9a50f323abe81,Merge_failed,488e4d658c9337dfc60cf550211ff89375362a23724d865f413025afc6dffa98,Merge_failed,c9f6b0ffb9a7895527358c762598a7c04b0398cc7324ccfd04f2fea1b219977a,Merge_failed,0b904e22ed47f5f0845746df445d7c1359ef411ad86e0dcae6351d78d355d90d,Merge_failed,0b904e22ed47f5f0845746df445d7c1359ef411ad86e0dcae6351d78d355d90d,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,0b904e22ed47f5f0845746df445d7c1359ef411ad86e0dcae6351d78d355d90d,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,plumelib_ort_adjacent,plumelib_ort_adjacent_merge_fingerprint,plumelib_ort_imports,plumelib_ort_imports_merge_fingerprint,plumelib_ort_version_number,plumelib_ort_version_number_merge_fingerprint | ||
9,refs/heads/master,c6ad45b63a9ee7e20b45c4176695a72efa31606a,69757fc487bf247b74339de637cb48ed296e5a67,721cb6fa847595de1b4b58fb80ec6079d15d9a95,,True,True,True,45,49,425,6,True,46,Tests_passed,05376667afdba29e22c97c992edaa40bf1866e03660bb315bdf828004927fae8,True,Tests_passed,0dd38c0c7dc253f9adc1ed53fbf0e6b43aca5ad15576b740bffdc47c97a43a47,True,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,29326553a8028f23a6604f8ec4736c8e60bfedd7ee241f8f43a324a7a0cdd8e6,Merge_failed,9c57575dab347e2e37bbf92c19a55a137bd5648fe61399131d68744e0801e3b6,Merge_failed,6a56b2c32156b5a3b892638ab2e7654f00fdb4c08c5b25fab88caf1c1db3bc09,Merge_failed,d248842099ea25d2e20f49e617634a46ab4024dfb985523d95bccb6c5ec7b2bb,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333 | ||
9,refs/heads/master,c6ad45b63a9ee7e20b45c4176695a72efa31606a,69757fc487bf247b74339de637cb48ed296e5a67,721cb6fa847595de1b4b58fb80ec6079d15d9a95,,True,True,True,45,49,425,6,True,46,Tests_passed,05376667afdba29e22c97c992edaa40bf1866e03660bb315bdf828004927fae8,True,Tests_passed,0dd38c0c7dc253f9adc1ed53fbf0e6b43aca5ad15576b740bffdc47c97a43a47,True,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,907b1bcbd6c0530192451b5a6b3f6bcad63bbd66a493b72d3c22694852f4b5bf,Merge_failed,9c57575dab347e2e37bbf92c19a55a137bd5648fe61399131d68744e0801e3b6,Merge_failed,6a56b2c32156b5a3b892638ab2e7654f00fdb4c08c5b25fab88caf1c1db3bc09,Merge_failed,d248842099ea25d2e20f49e617634a46ab4024dfb985523d95bccb6c5ec7b2bb,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.