-
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.
Update algorithm gitmerge_recursive_ignorespace to gitmerge_recursive…
…_myers_ignorespace
- Loading branch information
Showing
3,421 changed files
with
3,432 additions
and
3,429 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
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
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,4 +1,4 @@ | ||
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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint | ||
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_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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_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,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint | ||
5,refs/heads/master,766c135387b5f3eb7e464cc6730527eeb95baa7d,776567ef4e502d276d9b7f6a3c3ba70754fcabde,a42a9aa74631bb76921f1e76125f192aacbc0782,,True,True,True,13,31,147,2,True,13,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,True,Tests_passed,212c71215f2ad341af9344ea1ee08861fec2e90712b0e55cc698cda58ad403f5,True,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,16608a58bd15233ca38f9e5e235e92a8fc5df8f5a88d608ecbe1adb2cabafeac,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,16608a58bd15233ca38f9e5e235e92a8fc5df8f5a88d608ecbe1adb2cabafeac,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34 | ||
6,refs/heads/master,776567ef4e502d276d9b7f6a3c3ba70754fcabde,ece26b9bb6c5fcb3807dabf5810dce5a7e51cf05,ad5e18e5ce13fb70b20b15cbeb49c380c2049701,,True,True,True,13,43,154,3,True,13,Tests_passed,7443331472584e853baa7fa5152c8a93e8438c566b4f91c905258a0637c94ff3,True,Tests_passed,212b451b1f4695b9de086e78bf02ef6d9af76b604e8dc0cab2ef61acaa552543,True,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,ab1bd23ccd71385462ed94273ceda67a8a5d2ff5d0625e4739d8136ae584ccd2,Tests_failed,90aeb11365dae7eeb07d4a6b03327ec36bad0247263d116d711e94667ab72eda,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,ab1bd23ccd71385462ed94273ceda67a8a5d2ff5d0625e4739d8136ae584ccd2,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0 | ||
7,refs/heads/master,5af53e4af47a4f7638afa8520b08ef519e5042b3,9a06e785e8a0cffa134de02a602715b0cb50b9f8,1a4e908fd03df49084741bbd167328701826caae,,True,True,True,11,27,92,2,True,11,Tests_passed,df81935bef53d48936e123ec5697943b83c1e2d1de2f1417989a85eccf5ded37,True,Tests_passed,07f6c21a1269399c043bed38e4cbd84111558717b8d10f1367ef0b06092bae3b,True,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,af0ee49e18bdb6a7722bac9576e3c087445d5da94224ce3d7641f6dc266639a9,Tests_failed,ad5d380fdd0a4ef48084507e5859be952065705f53761383f767f3a968ff715b,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,af0ee49e18bdb6a7722bac9576e3c087445d5da94224ce3d7641f6dc266639a9,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615 |
Oops, something went wrong.