Code

History

Commits on ig/vimdiffwarn to lib/tests/test_conflicts.rs35+
  1. cleanup: enable `unused_trait_names` clippy lint and run `clippy --fix`Ilya Grigoriev committed 1 year agoacaedc3
  2. tests: run `insta --force-update-snapshots`Ilya Grigoriev committed 1 year ago5eae2d9
  3. conflicts: use clearer wording for missing newline commentScott Taylor committed 1 year ago66808e5
  4. conflicts: don't mark missing newline in Git-style conflictsScott Taylor committed 1 year ago0b71933
  5. conflicts: show "noeol" state in conflict marker commentScott Taylor committed 1 year ago66faeb4
  6. conflicts: allow missing newlines at end of fileScott Taylor committed 1 year ago326c453
  7. conflicts: remove support for non-simplified file conflictsScott Taylor committed 1 year ago352807c
  8. local_working_copy: store materialized conflict marker lengthScott Taylor committed 1 year ago6baa436
  9. conflicts: escape conflict markers by making them longerScott Taylor committed 1 year agob11ce6b
  10. conflicts: add "git" conflict marker styleScott Taylor committed 1 year ago26f5d61
  11. conflicts: add "snapshot" conflict marker styleScott Taylor committed 1 year agod2b06b9
  12. conflicts: add "ui.conflict-marker-style" configScott Taylor committed 1 year agoe5cb9f9
  13. conflicts: allow stripped trailing whitespace in diffsScott Taylor committed 1 year ago6e959fa
  14. conflicts: demo failed parse of diff with empty lineScott Taylor committed 1 year agoefacbcb
  15. conflicts: allow CRLF line endings on conflict markersScott Taylor committed 1 year ago9674852
  16. conflicts: demo failed parse of markers with CRLFScott Taylor committed 1 year agoee7f829
  17. conflicts: extract materialize_merge_result_to_bytes() helperYuya Nishihara committed 2 years ago59a79fd
  18. style: add semicolon at the end of expressions used as statementsSamuel Tardieu committed 2 years ago3f2ef2e
  19. conflicts: don't panic when a conflict marker is missing removesMartin von Zweigbergk committed 2 years ago3133534
  20. tests: test parsing conflicts with missing removes (#2611)Martin von Zweigbergk committed 2 years ago4f656f3
  21. formatting only: switch to Item level import ganularityMatt Kulukundis committed 2 years ago8ead72e
  22. conflicts: switch to multi-line regex, fix minor bugIlya Grigoriev committed 2 years agoe2f12d9
  23. conflicts: demo minor bugIlya Grigoriev committed 2 years agod095570
  24. conflicts: demo failure to materialize if conflicts don't end in a newlineIlya Grigoriev committed 2 years agof3de66e
  25. conflicts: propagate error from conflict materializationMartin von Zweigbergk committed 2 years agof8a5ad0
  26. conflicts: handle parsing of simplified conflictsBenjamin Tan committed 2 years ago7106f6f
  27. conflicts: label closing delimeter with conflict numberIlya Grigoriev committed 2 years ago1f7c4ec
  28. conflicts.rs: label conflict number and sides next to conflict markersIlya Grigoriev committed 2 years ago70b517c
  29. conflicts.rs: Teach `jj` to parse conflict markers that are followed by a labelIlya Grigoriev committed 2 years agof43a810
  30. test_conflicts and test_resolve_command: use `indoc!` to indent conflict markers in testsIlya Grigoriev committed 2 years ago02a04d0
  31. conflicts: test materialization with with negative snapshotsMartin von Zweigbergk committed 2 years ago502150b
  32. repo_path: split RepoPath into owned and borrowed typesYuya Nishihara committed 2 years ago28ab959
  33. repo_path: add stub RepoPathBuf type, update callersYuya Nishihara committed 2 years ago0a1bc2b
  34. merge: rename Merge::new() to Merge::from_removes_adds()Yuya Nishihara committed 3 years agoe0c3568
  35. merge: simply print interleaved conflict values in debug outputYuya Nishihara committed 3 years agof1898a3