Code

History

Commits on ig/vimdiffwarn to lib/src/conflicts.rs35+
  1. conflicts: pack MaterializedTreeValue::File fields, use read_all() helperYuya Nishihara committed 1 year agoe52ddda
  2. conflicts: extract MaterializedFileValue type from absorbYuya Nishihara committed 1 year agoa1eff50
  3. cleanup: enable `unused_trait_names` clippy lint and run `clippy --fix`Ilya Grigoriev committed 1 year agoacaedc3
  4. cleanup: switch to use<'_> capturing syntaxYuya Nishihara committed 1 year agoa27d925
  5. conflicts: use clearer wording for missing newline commentScott Taylor committed 1 year ago66808e5
  6. conflicts: don't mark missing newline in Git-style conflictsScott Taylor committed 1 year ago0b71933
  7. conflicts: show "noeol" state in conflict marker commentScott Taylor committed 1 year ago66faeb4
  8. conflicts: allow missing newlines at end of fileScott Taylor committed 1 year ago326c453
  9. conflicts: remove support for non-simplified file conflictsScott Taylor committed 1 year ago352807c
  10. local_working_copy: store materialized conflict marker lengthScott Taylor committed 1 year ago6baa436
  11. conflicts: escape conflict markers by making them longerScott Taylor committed 1 year agob11ce6b
  12. conflicts: refactor conflict marker writing and parsingScott Taylor committed 1 year ago369e8ea
  13. conflicts: add "git" conflict marker styleScott Taylor committed 1 year ago26f5d61
  14. conflicts: extract function for materializing hunkScott Taylor committed 1 year ago54c453b
  15. conflicts: add "snapshot" conflict marker styleScott Taylor committed 1 year agod2b06b9
  16. conflicts: extract header output into separate functionsScott Taylor committed 1 year ago863cba3
  17. conflicts: replace "if let" with "let else"Scott Taylor committed 1 year ago3c18268
  18. conflicts: add "ui.conflict-marker-style" configScott Taylor committed 1 year agoe5cb9f9
  19. conflicts: allow stripped trailing whitespace in diffsScott Taylor committed 1 year ago6e959fa
  20. conflicts: allow CRLF line endings on conflict markersScott Taylor committed 1 year ago9674852
  21. conflicts: extract materialize_merge_result_to_bytes() helperYuya Nishihara committed 2 years ago59a79fd
  22. conflicts: make materialize_merge_result() accept reference typeYuya Nishihara committed 2 years ago4cdead3
  23. conflicts: extract inner block of materialize_merge_result()Yuya Nishihara committed 2 years ago2aa913b
  24. diff: return matching hunk contents from all inputsYuya Nishihara committed 2 years ago383cca4
  25. lib: add short method summary to its documentationSamuel Tardieu committed 2 years ago8ba33b7
  26. conflicts: don't panic when a conflict marker is missing removesMartin von Zweigbergk committed 2 years ago3133534
  27. store: make `write_file()` asyncMartin von Zweigbergk committed 2 years ago4a8d250
  28. conflicts: pass around conflict contents without materializationYuya Nishihara committed 2 years ago9c9e564
  29. conflicts: split materialized value to FileConflict and OtherConflictYuya Nishihara committed 2 years ago73a8b13
  30. conflicts: make describe() simply return stringYuya Nishihara committed 2 years ago0c14a0a
  31. conflicts: replace ContentHunk with BStringYuya Nishihara committed 2 years ago1ba581b
  32. copies: extract (source, target) path pair to separate typeYuya Nishihara committed 2 years ago08262eb
  33. merged_tree: rename diff entry field from "value" to "values"Yuya Nishihara committed 2 years ago43bf195
  34. formatting only: switch to Item level import ganularityMatt Kulukundis committed 2 years ago8ead72e
  35. copies: add a separate diff stream item type with copy infoMartin von Zweigbergk committed 2 years ago721aa12