Code

History

Commits on ig/docs-commitid to lib/src/conflicts.rs35+
  1. backend: add CopyId to TreeValue::FileMartin von Zweigbergk committed 1 year agoa363e6b
  2. async: bubble up async-ness from Backend::read_fileMartin von Zweigbergk committed 1 year agod2cf2cb
  3. backend: make read_file() return a AsyncReadMartin von Zweigbergk committed 1 year agob970939
  4. store: drop "_async" suffix from read_file()/read_symlink()Martin von Zweigbergk committed 1 year ago23de072
  5. merge: add and use a function for mapping async functions concurrentlyMartin von Zweigbergk committed 1 year ago3c84a23
  6. merge: remove redundant .clone() from .simplify()Yuya Nishihara committed 1 year agoa2bd7b3
  7. merge: do not map absent tree entry to non-executableYuya Nishihara committed 1 year agob28bc42
  8. cli: resolve: use try_materialize_file_conflict_value()Yuya Nishihara committed 1 year agod2caf6f
  9. conflicts: store unsimplified file ids in MaterializedFileConflictValueYuya Nishihara committed 1 year agoe4bbb5b
  10. conflicts: extract function that materializes file conflictYuya Nishihara committed 1 year agoa856494
  11. conflicts: pack MaterializedTreeValue::FileConflict fields into structYuya Nishihara committed 1 year agof047add
  12. files: rename merge() to merge_hunks()Yuya Nishihara committed 1 year ago624cb66
  13. conflicts: pack MaterializedTreeValue::File fields, use read_all() helperYuya Nishihara committed 1 year agoe52ddda
  14. conflicts: extract MaterializedFileValue type from absorbYuya Nishihara committed 1 year agoa1eff50
  15. cleanup: enable `unused_trait_names` clippy lint and run `clippy --fix`Ilya Grigoriev committed 1 year agoacaedc3
  16. cleanup: switch to use<'_> capturing syntaxYuya Nishihara committed 1 year agoa27d925
  17. conflicts: use clearer wording for missing newline commentScott Taylor committed 1 year ago66808e5
  18. conflicts: don't mark missing newline in Git-style conflictsScott Taylor committed 1 year ago0b71933
  19. conflicts: show "noeol" state in conflict marker commentScott Taylor committed 1 year ago66faeb4
  20. conflicts: allow missing newlines at end of fileScott Taylor committed 1 year ago326c453
  21. conflicts: remove support for non-simplified file conflictsScott Taylor committed 1 year ago352807c
  22. local_working_copy: store materialized conflict marker lengthScott Taylor committed 1 year ago6baa436
  23. conflicts: escape conflict markers by making them longerScott Taylor committed 1 year agob11ce6b
  24. conflicts: refactor conflict marker writing and parsingScott Taylor committed 1 year ago369e8ea
  25. conflicts: add "git" conflict marker styleScott Taylor committed 1 year ago26f5d61
  26. conflicts: extract function for materializing hunkScott Taylor committed 1 year ago54c453b
  27. conflicts: add "snapshot" conflict marker styleScott Taylor committed 1 year agod2b06b9
  28. conflicts: extract header output into separate functionsScott Taylor committed 1 year ago863cba3
  29. conflicts: replace "if let" with "let else"Scott Taylor committed 1 year ago3c18268
  30. conflicts: add "ui.conflict-marker-style" configScott Taylor committed 1 year agoe5cb9f9
  31. conflicts: allow stripped trailing whitespace in diffsScott Taylor committed 1 year ago6e959fa
  32. conflicts: allow CRLF line endings on conflict markersScott Taylor committed 1 year ago9674852
  33. conflicts: extract materialize_merge_result_to_bytes() helperYuya Nishihara committed 2 years ago59a79fd
  34. conflicts: make materialize_merge_result() accept reference typeYuya Nishihara committed 2 years ago4cdead3
  35. conflicts: extract inner block of materialize_merge_result()Yuya Nishihara committed 2 years ago2aa913b