Skip to content

Commit

Permalink
Updated test case
Browse files Browse the repository at this point in the history
  • Loading branch information
@benedikt-schesch
benedikt-schesch committed Oct 28, 2023
1 parent d735b20 commit 5f6e610
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion test/small-goal-files/merges_analyzed/Algorithms.csv
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
idx,branch_name,merge,left,right,notes,diff_size,diff_contains_java_file,left_tree_fingerprint,left test result,left test coverage,parents pass,right_tree_fingerprint,right test result,right test coverage,test merge
idx,branch_name,merge,left,right,notes,diff_size,diff_contains_java_file,left_tree_fingerprint,left parent test result,left parent test coverage,parents pass,right_tree_fingerprint,right parent test result,right parent test coverage,test merge
1,refs/heads/master,44ce61beeb8bb5c5c1289db02f1da53f6bff6d8a,e121b3943958ba1558d8828db6f13c632e99f298,58129e828567fac52e821ca147feeab87a95d780,a parent is the base,92,False,7c30f2d67f153fbbdc9f62b081b97a0934b26589e57098e040802578d268baba,Tests_passed,0.97065981611682,True,c458f17db71a5030257903364d4572ca7fa357c7465e527dcfd5e7d9a0be90d4,Tests_passed,0.9707428879600917,False
2,refs/heads/master,e866ae7916d6b763f7d32f72f54edd735b5ea6bc,ae5dac889d19edd6c773e60420f00d4e7177f31f,4342b16e18da9082b32d5b8e9b5b6e3378461ce4,,147,False,f0e339f59763f214bf0ab37a25e4ba94e2af596db503b73d4388dc2abdde0605,Tests_passed,0.9712210497464712,True,fee471ff366749b92c431eeda17d56aa56701470f3a81f94355c76e798414ab4,Tests_passed,0.97065981611682,False
3,refs/heads/master,ae5dac889d19edd6c773e60420f00d4e7177f31f,38ec459e6f163991c6f88210720dcda4fecc64e8,eb3260404e596031bc9ee037b29bd1fcbb87f625,a parent is the base,60,False,20bd8c223130349dd809f82f7db86c666542e29cc3b8ccc7bdd5af4f64ca2714,Tests_passed,0.9712210497464712,True,f0e339f59763f214bf0ab37a25e4ba94e2af596db503b73d4388dc2abdde0605,Tests_passed,0.9712210497464712,False
Expand Down
2 changes: 1 addition & 1 deletion test/small-goal-files/merges_analyzed/JSCover.csv
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
idx,branch_name,merge,left,right,notes,diff_size,diff_contains_java_file,left_tree_fingerprint,left test result,left test coverage,parents pass,right_tree_fingerprint,right test result,right test coverage,test merge
idx,branch_name,merge,left,right,notes,diff_size,diff_contains_java_file,left_tree_fingerprint,left parent test result,left parent test coverage,parents pass,right_tree_fingerprint,right parent test result,right parent test coverage,test merge
1,refs/heads/master,31361bbe2317967a9c47cfc4437e2ce706f79056,fe64f8c1071a356027e49247fd506edc23566c4d,ab9b573de54d1014b5d9822adc9d9e5cf43ba8c0,,158,False,0964c40e9e97a2e3cf026a5f389c7847d6ebc7c71c7fb515075ab428c093535e,Tests_passed,0.8745331673483906,True,1c33990f3f8a1474d5ce29a9f425e4186fdd951e848a79d18570de9837aa4826,Tests_passed,0.8745331673483906,False
2,refs/heads/master,fe64f8c1071a356027e49247fd506edc23566c4d,b9ead12fd4a28a9fd7074ad4e97128943b072828,f5cb9ece38b7bd9ae97d7a55490476b84a2336df,a parent is the base,148,False,5ff8c7cbf214a58896dbca33fafb6940f2a6e19222f5b69d5660ebcf7a63b615,Tests_passed,0.8757646247953821,True,0964c40e9e97a2e3cf026a5f389c7847d6ebc7c71c7fb515075ab428c093535e,Tests_passed,0.8745331673483906,False
3,refs/heads/master,d6f0d1998a8db93117ba9c261d3b35d03633dc59,0eca5983951641b5d0884e6ce8fd162185d0cf05,d686e46aa0582b7dbee1f0d8664d6cb4b56600ec,a parent is the base,82,False,81fad259714fc7be34c891dcd38697dfcea66a688f159860ad3fc0bc3d7b2c8f,Tests_passed,0.8745331673483906,True,6cc40eab4a213c7640e2ff31e8d1676ee64bcdc32d4ddfa6edae2c86258cb519,Tests_passed,0.8757646247953821,False
Expand Down
26 changes: 13 additions & 13 deletions test/small-goal-files/merges_analyzed/ez-vcard.csv
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
idx,branch_name,merge,left,right,notes,diff_size,diff_contains_java_file,left test result,left_tree_fingerprint,parents pass,right_tree_fingerprint,right test result,right test coverage,test merge,left test coverage
1,refs/heads/master,0637f5fc19cf6ad79cd2c58981facc3678d5bbff,b8b0b0c8e1dff237975942022a42c6c25b9d9741,3c10bf587f097be3e2a77b0d2d556e6f9efd97b1,,77,False,Tests_passed,e677696d99009543543b67e43376936df48da7710eff36c66a37d4eaa1fc98e5,True,d187f1c73849a223e794329f88807bf76f60a16041876a0896846dbce5bb1861,Tests_passed,0.853562075784298,False,0.8535777267140491
2,refs/heads/master,633e9c677f26c1cae476d9ce43331cc30bd8f9e8,af63ebf1a441d0165bab7f6250caf0e2793b9829,22631a4817aa29b231919cb5d8c05d935386b763,a parent is the base,17,False,Tests_passed,f598d3120ef68309ed315a47e98d429cc60c53fa77a4189f6e8a43dfdf55fa25,True,9e86790517ce177c1a909da94e1af95469201985b918b77fc5011863183644a7,Tests_passed,0.85334653571333,False,0.85334653571333
3,refs/heads/master,a927decebd50d02bff3f8c56ade565b98d0ecd4c,2380144cf35bc2c211874ac53db2d846fccffb97,6621980643544df2261bd874717839dd24b28324,,70,False,Tests_passed,096c2d7eb164a14db32edc1795fbcb2a0581b74bd48dd262c1a055d11919ad81,True,5130a21901c613787b9283b8566df0875df8dfbbf369ba1c0fff23858649a88c,Tests_passed,0.8456949637123378,False,0.8457226084805848
4,refs/heads/master,d6a31c5fece9a634b7829df08bd0afa0ef06b69a,4639361f062ee6455b88e31996743e300240e71e,4e959f00b9e3a80ea99486834b0ab164be663fdc,a parent is the base,17,False,Tests_passed,5aa2dd4621da7b6c16236ae4f421ba167863bc71abe916fb4756f3b5830dbfe5,True,eda7ff9105f5b5526ffe4c43e4daf10a441d8ad3da01e76ca65e9573e9df456b,Tests_passed,0.8461919300272299,False,0.8461919300272299
5,refs/heads/master,8b26b8c56130e60347f8f20c17c3eca14b601cc1,e454bdf3e3b7d02bb95ff8a58952e70cb97dd0f9,522254f7ceb5e390cbb0904d698cb6294e081ce2,a parent is the base,39,False,Tests_passed,309996fcf2f75fdb2c75ff984b937ef0168bf1837b872e864544149f927bb14d,True,ca67a5201f9ee344350e60fcbf3145d37ba8b5f63655db51fb3a69f4f8f96ea0,Tests_passed,0.8517759917033965,False,0.8517759917033965
6,refs/heads/master,63ab6b841a7aa31372315a902b98fc5b2cc3b661,ea6026ee62cc184db68d841d50d58474fcdf4862,ab2032ca9769d452d4906f51cf56ca7d983a27c4,,17831,True,Tests_passed,aa82b49dd87edb07fbe37b7c2d6801fce8db7c437d1afe8a7b2723c81806286e,True,66055b6c4498a64239ae0e49781e086ed06ec3e58be7d9651c23c53f8c6bab6a,Tests_passed,0.7173103413091169,False,0.7582322978692876
7,refs/heads/master,5e11fc8e2c1f5763ff6e6b37d3e750e369af7c94,b42390b2d6279bf7c23580f0f4ac517cba448cd5,dee07e7edfb332efd5d5207660248f71e96a1a0e,,224,False,Tests_passed,eb24de92724a4a9cfded8b479cf21ee00bcbc24daa5032a4b5fb0504b2bea69a,True,31f6c872c0080531d16ac6b7efa7bd842985c69c185ff53af558b61b4c6a329c,Tests_passed,0.7026750196517472,False,0.7026750196517472
8,refs/heads/master,bce54f56a1da7332cabdec21b26e82cd899ce82b,16b6d6cd734326e55af96146ac89594c8ed1b233,ce422afbecd67144c1e8caceaa151f80d4f8a0cc,,1598,True,Tests_passed,a5e189b974c286e626dff96fe996698327301483890e32df62d647c7441e8b6c,True,e2a15289f8f14272bff7f3d76f800272b4b6e16760d80acd562bbc787e406721,Tests_passed,0.7195962185547188,False,0.7214297078008167
9,refs/heads/master,f238de6e66d3e5d03715aa88dccc660d0ab89318,03bd6bf2c9873b23344b31ca7c39524ad9ee5756,c824e9fabecc54d431d4c860b95a2ad13794556c,a parent is the base,54,False,Tests_passed,785747a7609141e6e381731036e1b1968b5b70b315cf80140e8af096727f6ee9,True,04155e098016a45775f99c28abc6cf0ff0bfcdfce0265d4120fffab7993d5d40,Tests_passed,0.7212701612903226,False,0.7211962001804384
10,refs/heads/master,a2a632bba203ee71191e71e11058726f2f030b00,345934e15e82c9cbffb5b297aab51ad105b9ad82,541f59d09b5232b68cda87ee2abba7c62d33ee32,,19,False,Tests_passed,a30b3c3d8e0b71e540c763f13d31dc4995c98abe5246092d7030f7ae8385518f,True,c3ac9a40ed916d3170b18a54d6d1859bd665c137a26837a701936bf28679b550,Tests_passed,0.7205625319314851,False,0.7205625319314851
11,refs/remotes/origin/pull/49,72e37df9ec88656844758c7303e8e1f9234295c3,24476c206b8df9f5458e2ec57fa16d3ebe23f898,64164540fa269cd1ed14f04236a88b8a3ac22dcb,,26434,True,Git_checkout_failed,,False,6a26b8452ea8957e10c32b00e3a4232a42a8a2189f106759b926ec0d968d116b,Tests_passed,0.8538166355527899,False,
12,refs/remotes/origin/pull/49,073c34351663673f4b53142bacf75033706e067f,64847e218c67593c77b0ebdefc93b5e7b4c82406,e80bea970d0b1a4ee340641f01b30b09f816eaa2,,28491,True,Git_checkout_failed,,False,db1bbb783df46c51866457b8a4c7a2365225682a680b961c9bbffcd419fb5838,Tests_passed,0.8492908269723463,False,
idx,branch_name,merge,left,right,notes,diff_size,diff_contains_java_file,left parent test result,left_tree_fingerprint,left parent test coverage,parents pass,right_tree_fingerprint,right parent test result,right parent test coverage,test merge
1,refs/heads/master,0637f5fc19cf6ad79cd2c58981facc3678d5bbff,b8b0b0c8e1dff237975942022a42c6c25b9d9741,3c10bf587f097be3e2a77b0d2d556e6f9efd97b1,,77,False,Tests_passed,e677696d99009543543b67e43376936df48da7710eff36c66a37d4eaa1fc98e5,0.8535777267140491,True,d187f1c73849a223e794329f88807bf76f60a16041876a0896846dbce5bb1861,Tests_passed,0.853562075784298,False
2,refs/heads/master,633e9c677f26c1cae476d9ce43331cc30bd8f9e8,af63ebf1a441d0165bab7f6250caf0e2793b9829,22631a4817aa29b231919cb5d8c05d935386b763,a parent is the base,17,False,Tests_passed,f598d3120ef68309ed315a47e98d429cc60c53fa77a4189f6e8a43dfdf55fa25,0.85334653571333,True,9e86790517ce177c1a909da94e1af95469201985b918b77fc5011863183644a7,Tests_passed,0.85334653571333,False
3,refs/heads/master,a927decebd50d02bff3f8c56ade565b98d0ecd4c,2380144cf35bc2c211874ac53db2d846fccffb97,6621980643544df2261bd874717839dd24b28324,,70,False,Tests_passed,096c2d7eb164a14db32edc1795fbcb2a0581b74bd48dd262c1a055d11919ad81,0.8457226084805848,True,5130a21901c613787b9283b8566df0875df8dfbbf369ba1c0fff23858649a88c,Tests_passed,0.8456949637123378,False
4,refs/heads/master,d6a31c5fece9a634b7829df08bd0afa0ef06b69a,4639361f062ee6455b88e31996743e300240e71e,4e959f00b9e3a80ea99486834b0ab164be663fdc,a parent is the base,17,False,Tests_passed,5aa2dd4621da7b6c16236ae4f421ba167863bc71abe916fb4756f3b5830dbfe5,0.8461919300272299,True,eda7ff9105f5b5526ffe4c43e4daf10a441d8ad3da01e76ca65e9573e9df456b,Tests_passed,0.8461919300272299,False
5,refs/heads/master,8b26b8c56130e60347f8f20c17c3eca14b601cc1,e454bdf3e3b7d02bb95ff8a58952e70cb97dd0f9,522254f7ceb5e390cbb0904d698cb6294e081ce2,a parent is the base,39,False,Tests_passed,309996fcf2f75fdb2c75ff984b937ef0168bf1837b872e864544149f927bb14d,0.8517759917033965,True,ca67a5201f9ee344350e60fcbf3145d37ba8b5f63655db51fb3a69f4f8f96ea0,Tests_passed,0.8517759917033965,False
6,refs/heads/master,63ab6b841a7aa31372315a902b98fc5b2cc3b661,ea6026ee62cc184db68d841d50d58474fcdf4862,ab2032ca9769d452d4906f51cf56ca7d983a27c4,,17831,True,Tests_passed,aa82b49dd87edb07fbe37b7c2d6801fce8db7c437d1afe8a7b2723c81806286e,0.7582322978692876,True,66055b6c4498a64239ae0e49781e086ed06ec3e58be7d9651c23c53f8c6bab6a,Tests_passed,0.7173103413091169,False
7,refs/heads/master,5e11fc8e2c1f5763ff6e6b37d3e750e369af7c94,b42390b2d6279bf7c23580f0f4ac517cba448cd5,dee07e7edfb332efd5d5207660248f71e96a1a0e,,224,False,Tests_passed,eb24de92724a4a9cfded8b479cf21ee00bcbc24daa5032a4b5fb0504b2bea69a,0.7026750196517472,True,31f6c872c0080531d16ac6b7efa7bd842985c69c185ff53af558b61b4c6a329c,Tests_passed,0.7026750196517472,False
8,refs/heads/master,bce54f56a1da7332cabdec21b26e82cd899ce82b,16b6d6cd734326e55af96146ac89594c8ed1b233,ce422afbecd67144c1e8caceaa151f80d4f8a0cc,,1598,True,Tests_passed,a5e189b974c286e626dff96fe996698327301483890e32df62d647c7441e8b6c,0.7214297078008167,True,e2a15289f8f14272bff7f3d76f800272b4b6e16760d80acd562bbc787e406721,Tests_passed,0.7195962185547188,False
9,refs/heads/master,f238de6e66d3e5d03715aa88dccc660d0ab89318,03bd6bf2c9873b23344b31ca7c39524ad9ee5756,c824e9fabecc54d431d4c860b95a2ad13794556c,a parent is the base,54,False,Tests_passed,785747a7609141e6e381731036e1b1968b5b70b315cf80140e8af096727f6ee9,0.7211962001804384,True,04155e098016a45775f99c28abc6cf0ff0bfcdfce0265d4120fffab7993d5d40,Tests_passed,0.7212701612903226,False
10,refs/heads/master,a2a632bba203ee71191e71e11058726f2f030b00,345934e15e82c9cbffb5b297aab51ad105b9ad82,541f59d09b5232b68cda87ee2abba7c62d33ee32,,19,False,Tests_passed,a30b3c3d8e0b71e540c763f13d31dc4995c98abe5246092d7030f7ae8385518f,0.7205625319314851,True,c3ac9a40ed916d3170b18a54d6d1859bd665c137a26837a701936bf28679b550,Tests_passed,0.7205625319314851,False
11,refs/remotes/origin/pull/49,72e37df9ec88656844758c7303e8e1f9234295c3,24476c206b8df9f5458e2ec57fa16d3ebe23f898,64164540fa269cd1ed14f04236a88b8a3ac22dcb,,26434,True,Git_checkout_failed,,,False,6a26b8452ea8957e10c32b00e3a4232a42a8a2189f106759b926ec0d968d116b,Tests_passed,0.8538166355527899,False
12,refs/remotes/origin/pull/49,073c34351663673f4b53142bacf75033706e067f,64847e218c67593c77b0ebdefc93b5e7b4c82406,e80bea970d0b1a4ee340641f01b30b09f816eaa2,,28491,True,Git_checkout_failed,,,False,db1bbb783df46c51866457b8a4c7a2365225682a680b961c9bbffcd419fb5838,Tests_passed,0.8492908269723463,False
6 changes: 3 additions & 3 deletions test/small-goal-files/merges_tested/JSCover.csv
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
idx,branch_name,merge,left,right,notes,diff_size,diff_contains_java_file,left_tree_fingerprint,left test result,left test coverage,parents pass,right_tree_fingerprint,right test result,right test coverage,test merge,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_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,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint
6,refs/heads/master,d780b34088c77fa4a5c7645b84d744f33ed0329f,428706a429ed1a3dca09588e989597fd9a9cb673,3a24d6bb388dfcf2696f71833f299e051e88cf1c,a parent is the base,392,True,e465e8275091cf468e4cf6fc70d89656f57cf4c656af0456a11cdf6af3253bbf,Tests_passed,0.8737521514629948,True,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,0.8754104026265768,True,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9
14,refs/heads/master,ba5decc5f42a1fd11825415612eaf104b8879c9a,b387036e5d7bba871c330469f2143c242f12a0d5,95d545f377cf84ccd52b54dc0c644d18daa447a6,a parent is the base,530,True,936bf008baece42fc21caaa7a4376675ff4566d092d9f204630d7a18ec8c5a60,Tests_passed,0.8512629399585921,True,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,0.8373498208388955,True,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2
idx,branch_name,merge,left,right,notes,diff_size,diff_contains_java_file,left_tree_fingerprint,left parent test result,left parent test coverage,parents pass,right_tree_fingerprint,right parent test result,right parent test coverage,test merge,left test result,right test result,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_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,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint
6,refs/heads/master,d780b34088c77fa4a5c7645b84d744f33ed0329f,428706a429ed1a3dca09588e989597fd9a9cb673,3a24d6bb388dfcf2696f71833f299e051e88cf1c,a parent is the base,392,True,e465e8275091cf468e4cf6fc70d89656f57cf4c656af0456a11cdf6af3253bbf,Tests_passed,0.8737521514629948,True,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,0.8754104026265768,True,Tests_passed,Tests_passed,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9,Tests_passed,1e5377760845f032cf9386b0f19505cfad688f3e8a232bdd3899687dcd64a9a9
14,refs/heads/master,ba5decc5f42a1fd11825415612eaf104b8879c9a,b387036e5d7bba871c330469f2143c242f12a0d5,95d545f377cf84ccd52b54dc0c644d18daa447a6,a parent is the base,530,True,936bf008baece42fc21caaa7a4376675ff4566d092d9f204630d7a18ec8c5a60,Tests_passed,0.8512629399585921,True,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,0.8373498208388955,True,Tests_passed,Tests_passed,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2,Tests_passed,6c77d631a29d0a23a81d70eae537981f5c7866d7af2c121f7cdee706ebdbcdc2

0 comments on commit 5f6e610

Please sign in to comment.