Code

History

Commits on ig/commit-debug to lib/tests/test_conflicts.rs35+
  1. merged_tree: move MergeOptions to tree_mergeMartin von Zweigbergk committed 1 year ago92bc6e4
  2. files, tree: make same-change conflict resolution configurableYuya Nishihara committed 1 year agoaf4fe21
  3. files: rename FileMergeOptions to MergeOptions, move to merged_treeYuya Nishihara committed 1 year ago0376bcf
  4. files: add option to resolve conflicts word by wordYuya Nishihara committed 2 years ago9589bec
  5. files: introduce stub of FileMergeOptionsYuya Nishihara committed 1 year agoe9e9c6f
  6. conflicts: compare new hunks without fully materializing original to textYuya Nishihara committed 1 year ago4dee8e4
  7. conflicts: pack marker style/len into struct, merge materialize functionsYuya Nishihara committed 1 year ago1cd6f9f
  8. cli, lib: move to Rust 2024 language editionAustin Seipp committed 1 year agoba24140
  9. tests: leverage tests_utils::read_file()Martin von Zweigbergk committed 1 year ago84f188b
  10. test: introduce test helpers for creating repo path typesMartin von Zweigbergk committed 1 year agof0545ee
  11. merge: remove redundant .clone() from .simplify()Yuya Nishihara committed 1 year agoa2bd7b3
  12. cleanup: enable `unused_trait_names` clippy lint and run `clippy --fix`Ilya Grigoriev committed 1 year agoacaedc3
  13. tests: run `insta --force-update-snapshots`Ilya Grigoriev committed 1 year ago5eae2d9
  14. conflicts: use clearer wording for missing newline commentScott Taylor committed 1 year ago66808e5
  15. conflicts: don't mark missing newline in Git-style conflictsScott Taylor committed 1 year ago0b71933
  16. conflicts: show "noeol" state in conflict marker commentScott Taylor committed 1 year ago66faeb4
  17. conflicts: allow missing newlines at end of fileScott Taylor committed 1 year ago326c453
  18. conflicts: remove support for non-simplified file conflictsScott Taylor committed 1 year ago352807c
  19. local_working_copy: store materialized conflict marker lengthScott Taylor committed 1 year ago6baa436
  20. conflicts: escape conflict markers by making them longerScott Taylor committed 1 year agob11ce6b
  21. conflicts: add "git" conflict marker styleScott Taylor committed 1 year ago26f5d61
  22. conflicts: add "snapshot" conflict marker styleScott Taylor committed 1 year agod2b06b9
  23. conflicts: add "ui.conflict-marker-style" configScott Taylor committed 1 year agoe5cb9f9
  24. conflicts: allow stripped trailing whitespace in diffsScott Taylor committed 1 year ago6e959fa
  25. conflicts: demo failed parse of diff with empty lineScott Taylor committed 1 year agoefacbcb
  26. conflicts: allow CRLF line endings on conflict markersScott Taylor committed 1 year ago9674852
  27. conflicts: demo failed parse of markers with CRLFScott Taylor committed 1 year agoee7f829
  28. conflicts: extract materialize_merge_result_to_bytes() helperYuya Nishihara committed 2 years ago59a79fd
  29. style: add semicolon at the end of expressions used as statementsSamuel Tardieu committed 2 years ago3f2ef2e
  30. conflicts: don't panic when a conflict marker is missing removesMartin von Zweigbergk committed 2 years ago3133534
  31. tests: test parsing conflicts with missing removes (#2611)Martin von Zweigbergk committed 2 years ago4f656f3
  32. formatting only: switch to Item level import ganularityMatt Kulukundis committed 2 years ago8ead72e
  33. conflicts: switch to multi-line regex, fix minor bugIlya Grigoriev committed 2 years agoe2f12d9
  34. conflicts: demo minor bugIlya Grigoriev committed 2 years agod095570
  35. conflicts: demo failure to materialize if conflicts don't end in a newlineIlya Grigoriev committed 2 years agof3de66e