Code

History

Commits on ig/commit-debug to lib/src/conflicts.rs35+
  1. cleanup: remove redundant + use<'_> after migrating to 2024 editionYuya Nishihara committed 1 year ago5f40f62
  2. merge: add a generic `Diff<T>` type, use in `TreeDiffEntry`Martin von Zweigbergk committed 1 year ago4f456ec
  3. cli_util: rename `Diff` to `ContentDiff`Martin von Zweigbergk committed 1 year ago452a1a4
  4. merge: remove Default from MergeOptionsYuya Nishihara committed 1 year ago8cd43d1
  5. cleanup: replace clippy allow() exemptions by expect()Martin von Zweigbergk committed 1 year ago8aa9d1d
  6. merged_tree: move MergeOptions to tree_mergeMartin von Zweigbergk committed 1 year ago92bc6e4
  7. files, tree: make same-change conflict resolution configurableYuya Nishihara committed 1 year agoaf4fe21
  8. files: rename FileMergeOptions to MergeOptions, move to merged_treeYuya Nishihara committed 1 year ago0376bcf
  9. files: introduce stub of FileMergeOptionsYuya Nishihara committed 1 year agoe9e9c6f
  10. conflicts: compare new hunks without fully materializing original to textYuya Nishihara committed 1 year ago4dee8e4
  11. backend: remove unused TreeValue::Conflict and read/write methodsMartin von Zweigbergk committed 1 year agoda6c4b6
  12. conflicts: pack marker style/len into struct, merge materialize functionsYuya Nishihara committed 1 year ago1cd6f9f
  13. cli, lib: move to Rust 2024 language editionAustin Seipp committed 1 year agoba24140
  14. cli lib: make use of `Self` consistentadamnemecek committed 1 year ago8a26df2
  15. cleanup: switch to async closures in trivial casesMartin von Zweigbergk committed 1 year agof27c55a
  16. local working copy: add support for EOL conversionKaiyi Li committed 1 year agof1f1556
  17. backend: add CopyId to TreeValue::FileMartin von Zweigbergk committed 1 year agoa363e6b
  18. async: bubble up async-ness from Backend::read_fileMartin von Zweigbergk committed 1 year agod2cf2cb
  19. backend: make read_file() return a AsyncReadMartin von Zweigbergk committed 1 year agob970939
  20. store: drop "_async" suffix from read_file()/read_symlink()Martin von Zweigbergk committed 1 year ago23de072
  21. merge: add and use a function for mapping async functions concurrentlyMartin von Zweigbergk committed 1 year ago3c84a23
  22. merge: remove redundant .clone() from .simplify()Yuya Nishihara committed 1 year agoa2bd7b3
  23. merge: do not map absent tree entry to non-executableYuya Nishihara committed 1 year agob28bc42
  24. cli: resolve: use try_materialize_file_conflict_value()Yuya Nishihara committed 1 year agod2caf6f
  25. conflicts: store unsimplified file ids in MaterializedFileConflictValueYuya Nishihara committed 1 year agoe4bbb5b
  26. conflicts: extract function that materializes file conflictYuya Nishihara committed 1 year agoa856494
  27. conflicts: pack MaterializedTreeValue::FileConflict fields into structYuya Nishihara committed 1 year agof047add
  28. files: rename merge() to merge_hunks()Yuya Nishihara committed 1 year ago624cb66
  29. conflicts: pack MaterializedTreeValue::File fields, use read_all() helperYuya Nishihara committed 1 year agoe52ddda
  30. conflicts: extract MaterializedFileValue type from absorbYuya Nishihara committed 1 year agoa1eff50
  31. cleanup: enable `unused_trait_names` clippy lint and run `clippy --fix`Ilya Grigoriev committed 1 year agoacaedc3
  32. cleanup: switch to use<'_> capturing syntaxYuya Nishihara committed 1 year agoa27d925
  33. conflicts: use clearer wording for missing newline commentScott Taylor committed 1 year ago66808e5
  34. conflicts: don't mark missing newline in Git-style conflictsScott Taylor committed 1 year ago0b71933
  35. conflicts: show "noeol" state in conflict marker commentScott Taylor committed 1 year ago66faeb4