Skip to content

Commit

Permalink
Update import merge tool (#271)
Browse files Browse the repository at this point in the history
  • Loading branch information
benedikt-schesch authored Jun 6, 2024
1 parent c10873d commit 1ebf695
Show file tree
Hide file tree
Showing 3,632 changed files with 60,899 additions and 40,050 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 1 addition & 2 deletions .github/workflows/check-reproducibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,9 @@ jobs:
run: make clean
- run: echo "LOGURU_COLORIZE=NO" >> $GITHUB_ENV
- name: Build
run: cd src/scripts/merge_tools/merging && ./gradlew -q shadowJar
run: cd src/scripts/merge_tools/merging && ./gradlew shadowJar
- name: make check-merges-reproducibility
run: |
python3 src/python/replay_merge.py --merges_csv results/combined/result.csv -delete_workdir --idx 38-192
head -n 151 results/combined/result.csv > temp.csv && mv temp.csv results/combined/result.csv
make check-merges-reproducibility
env:
Expand Down
1 change: 1 addition & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[submodule "src/scripts/merge_tools/merging"]
path = src/scripts/merge_tools/merging
url = https://github.com/plume-lib/merging.git
pushurl = [email protected]:plume-lib/merging.git
ignore = dirty
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,11 @@ clean-local:
rm -rf repos

check-merges-reproducibility:
@echo "Running replay_merge for each idx in parallel using GNU Parallel..."
@echo "Running replay_merge sequentially for each idx..."
@set -e; \
tail -n +2 $(CSV_RESULTS) | awk -F, '{print $$1}' | parallel --halt now,fail=1 -j 50% python3 src/python/replay_merge.py --testing --merges_csv $(CSV_RESULTS) -skip_build -delete_workdir --idx {}
for idx in $(shell tail -n +2 $(CSV_RESULTS) | awk -F, '{print $$1}'); do \
src/python/replay_merge.py --testing --merges_csv $(CSV_RESULTS) -skip_build -delete_workdir --idx $$idx; \
done

protect-repos:
find repos -mindepth 1 -type d -exec chmod a-w {} +
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ To run the stack on all repos:
./run_full.sh
```

To run the stack on all repos and also diff the merges outputs:
To run the stack on all repos and also diff the merges' outputs:

```bash
./run_full.sh -d
Expand Down Expand Up @@ -217,4 +217,4 @@ To investigate differences between two mergers:

* edit file `src/python/select_from_results.py` to reflect the differences you are interested in.
* run `src/python/select_from_results.py` to create a .csv database containing only the differences.
* run `src/python/replay_merge.py --merges_csv CSV_FILE --idx INDEX` (maybe add `-test`) for the index of the merge you are interested in.
* run `src/python/replay_merge.py --idx INDEX` (maybe add `-test`) for the index of the merge you are interested in.
102 changes: 102 additions & 0 deletions results/combined/inconsistent_results.csv

Large diffs are not rendered by default.

Binary file modified results/combined/merges_analyzer_histograms.pdf
Binary file not shown.
8 changes: 4 additions & 4 deletions results/combined/merges_tested/47deg/firebrand.csv
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint
5,refs/heads/master,766c135387b5f3eb7e464cc6730527eeb95baa7d,776567ef4e502d276d9b7f6a3c3ba70754fcabde,a42a9aa74631bb76921f1e76125f192aacbc0782,,True,True,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,212c71215f2ad341af9344ea1ee08861fec2e90712b0e55cc698cda58ad403f5,Tests_passed,True,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,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,16608a58bd15233ca38f9e5e235e92a8fc5df8f5a88d608ecbe1adb2cabafeac,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34
6,refs/heads/master,776567ef4e502d276d9b7f6a3c3ba70754fcabde,ece26b9bb6c5fcb3807dabf5810dce5a7e51cf05,ad5e18e5ce13fb70b20b15cbeb49c380c2049701,,True,True,7443331472584e853baa7fa5152c8a93e8438c566b4f91c905258a0637c94ff3,Tests_passed,212b451b1f4695b9de086e78bf02ef6d9af76b604e8dc0cab2ef61acaa552543,Tests_passed,True,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,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,ab1bd23ccd71385462ed94273ceda67a8a5d2ff5d0625e4739d8136ae584ccd2,Tests_failed,90aeb11365dae7eeb07d4a6b03327ec36bad0247263d116d711e94667ab72eda
7,refs/heads/master,5af53e4af47a4f7638afa8520b08ef519e5042b3,9a06e785e8a0cffa134de02a602715b0cb50b9f8,1a4e908fd03df49084741bbd167328701826caae,,True,True,df81935bef53d48936e123ec5697943b83c1e2d1de2f1417989a85eccf5ded37,Tests_passed,07f6c21a1269399c043bed38e4cbd84111558717b8d10f1367ef0b06092bae3b,Tests_passed,True,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,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,af0ee49e18bdb6a7722bac9576e3c087445d5da94224ce3d7641f6dc266639a9,Tests_failed,ad5d380fdd0a4ef48084507e5859be952065705f53761383f767f3a968ff715b
idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,plumelib_ort_adjacent,plumelib_ort_adjacent_merge_fingerprint,plumelib_ort_adjacent_ignorespace,plumelib_ort_adjacent_ignorespace_merge_fingerprint,plumelib_ort_imports,plumelib_ort_imports_merge_fingerprint,plumelib_ort_imports_ignorespace,plumelib_ort_imports_ignorespace_merge_fingerprint,plumelib_ort_version_number,plumelib_ort_version_number_merge_fingerprint,plumelib_ort_version_number_ignorespace,plumelib_ort_version_number_ignorespace_merge_fingerprint
5,refs/heads/master,766c135387b5f3eb7e464cc6730527eeb95baa7d,776567ef4e502d276d9b7f6a3c3ba70754fcabde,a42a9aa74631bb76921f1e76125f192aacbc0782,,True,True,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,212c71215f2ad341af9344ea1ee08861fec2e90712b0e55cc698cda58ad403f5,Tests_passed,True,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
6,refs/heads/master,776567ef4e502d276d9b7f6a3c3ba70754fcabde,ece26b9bb6c5fcb3807dabf5810dce5a7e51cf05,ad5e18e5ce13fb70b20b15cbeb49c380c2049701,,True,True,7443331472584e853baa7fa5152c8a93e8438c566b4f91c905258a0637c94ff3,Tests_passed,212b451b1f4695b9de086e78bf02ef6d9af76b604e8dc0cab2ef61acaa552543,Tests_passed,True,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
7,refs/heads/master,5af53e4af47a4f7638afa8520b08ef519e5042b3,9a06e785e8a0cffa134de02a602715b0cb50b9f8,1a4e908fd03df49084741bbd167328701826caae,,True,True,df81935bef53d48936e123ec5697943b83c1e2d1de2f1417989a85eccf5ded37,Tests_passed,07f6c21a1269399c043bed38e4cbd84111558717b8d10f1367ef0b06092bae3b,Tests_passed,True,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
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint
2,refs/heads/master,8e72563c34b534951407fc553222e2d2b2536b0a,21d45d6b78e3e7c6f749cd7a8dd64897cc34a0d4,5e338acd3c7d8fab4361594dfc084ad2a89f31eb,,8a1c1183895492fa26e72e027ade5ffda13b00ae025bee8bc8ef0773c8125d4b,Tests_passed,6346c5a5c40e39265013e7eba7b2e41781f1a17fe78679fdc734e4e48a403ff6,Tests_passed,True,True,True,True,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,ab987682137551e396c32439051d9f6a1bbafa70346840447d9fd964ee150b80,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02
idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,plumelib_ort_adjacent,plumelib_ort_adjacent_merge_fingerprint,plumelib_ort_adjacent_ignorespace,plumelib_ort_adjacent_ignorespace_merge_fingerprint,plumelib_ort_imports,plumelib_ort_imports_merge_fingerprint,plumelib_ort_imports_ignorespace,plumelib_ort_imports_ignorespace_merge_fingerprint,plumelib_ort_version_number,plumelib_ort_version_number_merge_fingerprint,plumelib_ort_version_number_ignorespace,plumelib_ort_version_number_ignorespace_merge_fingerprint
2,refs/heads/master,8e72563c34b534951407fc553222e2d2b2536b0a,21d45d6b78e3e7c6f749cd7a8dd64897cc34a0d4,5e338acd3c7d8fab4361594dfc084ad2a89f31eb,,8a1c1183895492fa26e72e027ade5ffda13b00ae025bee8bc8ef0773c8125d4b,Tests_passed,6346c5a5c40e39265013e7eba7b2e41781f1a17fe78679fdc734e4e48a403ff6,Tests_passed,True,True,True,True,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,ab987682137551e396c32439051d9f6a1bbafa70346840447d9fd964ee150b80,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02
Loading

0 comments on commit 1ebf695

Please sign in to comment.