Index of /src/mergiraf-0.4.0/examples/spork/working/
../
both_modified_IGNORE_local_type_inference/ 09-Dec-2024 08:26 -
both_modified_adapt_indentation/ 09-Dec-2024 08:26 -
both_modified_add_field_modifiers/ 09-Dec-2024 08:26 -
both_modified_add_file_header/ 09-Dec-2024 08:26 -
both_modified_add_identical_elements_in_method/ 09-Dec-2024 08:26 -
both_modified_add_import_statements/ 09-Dec-2024 08:26 -
both_modified_add_parameter/ 09-Dec-2024 08:26 -
both_modified_add_parameters_and_thrown_types/ 09-Dec-2024 08:26 -
both_modified_add_same_method/ 09-Dec-2024 08:26 -
both_modified_add_type_member_and_comment/ 09-Dec-2024 08:26 -
both_modified_change_binops/ 09-Dec-2024 08:26 -
both_modified_change_parameter_varargs/ 09-Dec-2024 08:26 -
both_modified_change_primitive_to_reference/ 09-Dec-2024 08:26 -
both_modified_change_unary_ops/ 09-Dec-2024 08:26 -
both_modified_change_wildcard_bounds/ 09-Dec-2024 08:26 -
both_modified_compilation_unit_comment/ 09-Dec-2024 08:26 -
both_modified_delete_method/ 09-Dec-2024 08:26 -
both_modified_edit_different_comments/ 09-Dec-2024 08:26 -
both_modified_method_method_ordering_conflict/ 09-Dec-2024 08:26 -
both_modified_move_if/ 09-Dec-2024 08:26 -
both_modified_root_conflict_with_edits_in_left/ 09-Dec-2024 08:26 -
both_modified_simple_root_conflict/ 09-Dec-2024 08:26 -
both_modified_two_way_merge/ 09-Dec-2024 08:26 -
conflict_add_similar_fields/ 09-Dec-2024 08:26 -
conflict_conflicting_type_change/ 09-Dec-2024 08:26 -
conflict_multiple_conflicting_statements/ 09-Dec-2024 08:26 -
conflict_multiple_simple_conflicts/ 09-Dec-2024 08:26 -
conflict_simple_delete_delete/ 09-Dec-2024 08:26 -
conflict_simple_insert_delete/ 09-Dec-2024 08:26 -
conflict_single_conflicting_statement/ 09-Dec-2024 08:26 -
conflicting_comment_edits/ 09-Dec-2024 08:26 -
conflicting_operator_change/ 09-Dec-2024 08:26 -
intra_parent_move_conflict/ 09-Dec-2024 08:26 -
left_modified_add_annotation_key_value_pair/ 09-Dec-2024 08:26 -
left_modified_add_block_comment/ 09-Dec-2024 08:26 -
left_modified_add_class_visibility/ 09-Dec-2024 08:26 -
left_modified_add_if_block/ 09-Dec-2024 08:26 -
left_modified_add_inline_comment/ 09-Dec-2024 08:26 -
left_modified_add_nested_class/ 09-Dec-2024 08:26 -
left_modified_add_package_private_class/ 09-Dec-2024 08:26 -
left_modified_add_parameter/ 09-Dec-2024 08:26 -
left_modified_append_annotation_key_value_pair/ 09-Dec-2024 08:26 -
left_modified_change_declared_type/ 09-Dec-2024 08:26 -
left_modified_change_field_modifiers/ 09-Dec-2024 08:26 -
left_modified_change_package_statement/ 09-Dec-2024 08:26 -
left_modified_delete_if_block/ 09-Dec-2024 08:26 -
left_modified_delete_method/ 09-Dec-2024 08:26 -
left_modified_edit_annotations/ 09-Dec-2024 08:26 -
left_modified_empty_parameter_list/ 09-Dec-2024 08:26 -
left_modified_empty_thrown_types/ 09-Dec-2024 08:26 -
left_modified_generify_method/ 09-Dec-2024 08:26 -
left_modified_implement_default_method/ 09-Dec-2024 08:26 -
left_modified_make_method_void/ 09-Dec-2024 08:26 -
left_modified_modify_array_type/ 09-Dec-2024 08:26 -
left_modified_move_value_from_body_to_annotation/ 09-Dec-2024 08:26 -
left_modified_multi_declaration_initialization_..> 09-Dec-2024 08:26 -
left_modified_multi_declaration_initialization_..> 09-Dec-2024 08:26 -
left_modified_rename_class/ 09-Dec-2024 08:26 -
left_modified_rename_enum/ 09-Dec-2024 08:26 -
left_modified_rename_interface/ 09-Dec-2024 08:26 -
left_modified_rename_method/ 09-Dec-2024 08:26 -
left_modified_rename_parameter/ 09-Dec-2024 08:26 -
left_modified_rename_type_parameter/ 09-Dec-2024 08:26 -
left_modified_rename_variable/ 09-Dec-2024 08:26 -
left_modified_single_line_multi_field_declarations 09-Dec-2024 08:26 -
left_modified_single_line_multi_local_var_decla..> 09-Dec-2024 08:26 -
plain_text/ 09-Dec-2024 08:26 -