Code

History

Commits on ig/commit-debug to lib/src/merge.rs35+
  1. merge: add a generic `Diff<T>` type, use in `TreeDiffEntry`Martin von Zweigbergk committed 1 year ago4f456ec
  2. merge: remove Default from MergeOptionsYuya Nishihara committed 1 year ago8cd43d1
  3. files, tree: make same-change conflict resolution configurableYuya Nishihara committed 1 year agoaf4fe21
  4. merge: parameterize same-change rule of trivial_merge()Yuya Nishihara committed 1 year ago949fd2a
  5. codespell: forbid British EnglishIlya Grigoriev committed 1 year ago93368f1
  6. backend: remove unused TreeValue::Conflict and read/write methodsMartin von Zweigbergk committed 1 year agoda6c4b6
  7. merge: fix formatting in Merge method doc commentsJosh Steadmon committed 1 year agof5e7706
  8. cli, lib: move to Rust 2024 language editionAustin Seipp committed 1 year agoba24140
  9. cli lib: make use of `Self` consistentadamnemecek committed 1 year ago8a26df2
  10. cleanup: switch to async closures in trivial casesMartin von Zweigbergk committed 1 year agof27c55a
  11. merge: add a method for checking for present non-tree valueMartin von Zweigbergk committed 1 year ago470a6e6
  12. merge: derive serde::Serialize for RefTargetYuya Nishihara committed 1 year agof5424fa
  13. backend: add CopyId to TreeValue::FileMartin von Zweigbergk committed 1 year agoa363e6b
  14. merge: avoid matching `borrow_tree_value()` result against referenceMartin von Zweigbergk committed 1 year ago1c185a6
  15. merge: make `to_tree_merge()` read trees concurrentlyMartin von Zweigbergk committed 1 year ago5ccd0db
  16. merge: add and use a function for mapping async functions concurrentlyMartin von Zweigbergk committed 1 year ago3c84a23
  17. merge: clarify expectation of with_new_file_ids()Yuya Nishihara committed 1 year ago81344e6
  18. merge: remove redundant .clone() from .simplify()Yuya Nishihara committed 1 year agoa2bd7b3
  19. merge: do not map absent tree entry to non-executableYuya Nishihara committed 1 year agob28bc42
  20. merge: use .try_map() internally to transform Merge<TreeValue>Yuya Nishihara committed 1 year agoecee441
  21. cleanup: use new array methods instead of .collect_tuple()/.next_tuple()Yuya Nishihara committed 1 year ago60b9612
  22. files: extract iterator from merge_hunks()Yuya Nishihara committed 1 year ago8b32eaf
  23. cleanup: enable `unused_trait_names` clippy lint and run `clippy --fix`Ilya Grigoriev committed 1 year agoacaedc3
  24. merge: inline trivial_merge_inner()Yuya Nishihara committed 1 year ago3d4b5e4
  25. merge: update test values to be simpler and more clearly exhaustiveMartin von Zweigbergk committed 1 year ago8a3ae86
  26. merge: make `trivial_merge()` take a single slice of interleaved termsMartin von Zweigbergk committed 1 year ago7149429
  27. store: make `get_tree()` functions take owned repo pathMartin von Zweigbergk committed 1 year ago409be2e
  28. merge: add `as_slice()` methodScott Taylor committed 1 year agoec6220d
  29. object_id: implement Display on ObjectId typesYuya Nishihara committed 2 years agoad4b940
  30. style: add semicolon at the end of expressions used as statementsSamuel Tardieu committed 2 years ago3f2ef2e
  31. lib: add short method summary to its documentationSamuel Tardieu committed 2 years ago8ba33b7
  32. conflicts: make describe() simply return stringYuya Nishihara committed 2 years ago0c14a0a
  33. cleanup: remove redundant ::{self} from use declarationsYuya Nishihara committed 2 years ago87fb169
  34. formatting only: switch to Item level import ganularityMatt Kulukundis committed 2 years ago8ead72e
  35. merged_tree: replace MergedTreeVal<'_> by Merge<Option<&TreeValue>>Yuya Nishihara committed 2 years agof7377fb

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t