|
|
config_conflicts.yaml_both.expected
|
tests
|
|
|
|
config_conflicts.yaml_incoming.expected
|
tests
|
|
|
|
config_conflicts.yaml_local.expected
|
tests
|
|
|
|
edge_adjacent_conflicts.txt_both.expected
|
tests
|
|
|
|
edge_adjacent_conflicts.txt_incoming.expected
|
tests
|
|
|
|
edge_adjacent_conflicts.txt_local.expected
|
tests
|
|
|
|
edge_empty_conflicts.txt_both.expected
|
tests
|
|
|
|
edge_empty_conflicts.txt_incoming.expected
|
tests
|
|
|
|
edge_empty_conflicts.txt_local.expected
|
tests
|
|
|
|
edge_file_boundaries.txt_both.expected
|
tests
|
|
|
|
edge_file_boundaries.txt_incoming.expected
|
tests
|
|
|
|
edge_file_boundaries.txt_local.expected
|
tests
|
|
|
|
edge_single_line.txt_both.expected
|
tests
|
|
|
|
edge_single_line.txt_incoming.expected
|
tests
|
|
|
|
edge_single_line.txt_local.expected
|
tests
|
|
|
|
multi_conflict.f90_both.expected
|
tests
|
|
|
|
multi_conflict.f90_incoming.expected
|
tests
|
|
|
|
multi_conflict.f90_local.expected
|
tests
|
|
|
|
real_html.html_both.expected
|
tests
|
|
|
|
real_html.html_incoming.expected
|
tests
|
|
|
|
real_html.html_local.expected
|
tests
|
|
|
|
real_makefile.mk_both.expected
|
tests
|
|
|
|
real_makefile.mk_incoming.expected
|
tests
|
|
|
|
real_makefile.mk_local.expected
|
tests
|
|
|
|
real_package_json.json_both.expected
|
tests
|
|
|
|
real_package_json.json_incoming.expected
|
tests
|
|
|
|
real_package_json.json_local.expected
|
tests
|
|
|
|
real_schema.sql_both.expected
|
tests
|
|
|
|
real_schema.sql_incoming.expected
|
tests
|
|
|
|
real_schema.sql_local.expected
|
tests
|
|
|
|
similar_conflicts.py_both.expected
|
tests
|
|
|
|
similar_conflicts.py_incoming.expected
|
tests
|
|
|
|
similar_conflicts.py_local.expected
|
tests
|
|
|
|
stress_large_conflict.f90_both.expected
|
tests
|
|
|
|
stress_large_conflict.f90_incoming.expected
|
tests
|
|
|
|
stress_large_conflict.f90_local.expected
|
tests
|
|
|
|
stress_long_lines.txt_both.expected
|
tests
|
|
|
|
stress_long_lines.txt_incoming.expected
|
tests
|
|
|
|
stress_long_lines.txt_local.expected
|
tests
|
|
|
|
stress_many_conflicts.txt_both.expected
|
tests
|
|
|
|
stress_many_conflicts.txt_incoming.expected
|
tests
|
|
|
|
stress_many_conflicts.txt_local.expected
|
tests
|
|
|
|
whitespace_indentation.py_both.expected
|
tests
|
|
|
|
whitespace_indentation.py_incoming.expected
|
tests
|
|
|
|
whitespace_indentation.py_local.expected
|
tests
|
|
|
|
whitespace_trailing.txt_both.expected
|
tests
|
|
|
|
whitespace_trailing.txt_incoming.expected
|
tests
|
|
|
|
whitespace_trailing.txt_local.expected
|
tests
|
|
