Code

History

Commits on git-sync to lib/src/conflicts.rs35+
  1. lib: Make tokio optional by replacing tokio traits with future traitsOlshaMB committed 6 months ago0be1603
  2. conflicts: after parsing markers, write contents to backend concurrentlyMartin von Zweigbergk committed 8 months agoc866cc9
  3. clippy: fix single_char_pattern lintxtqqczze committed 9 months agoff89db5
  4. conflicts: use the original EOL for materializationKaiyi Li committed 10 months ago3be17c0
  5. conflict: encode ending EOL conflicts in the materialized conflictKaiyi Li committed 10 months agobed8e07
  6. conflicts: share the label logic between git style and jj styleKaiyi Li committed 10 months ago12a04f5
  7. clippy: fix ref_option lintxtqqczze committed 10 months agof0cc0db
  8. conflicts: promote absent sides to existKaiyi Li committed 1 year ago821d1a9
  9. merge: include conflict labels when describing non-file conflictsScott Taylor committed 10 months ago34a1f86
  10. conflicts: show "noeol" state separately for each side of a diffScott Taylor committed 11 months ago2ce2a44
  11. conflicts: materialize conflict labels if presentScott Taylor committed 1 year ago242e2f8
  12. conflicts: update conflict marker formatScott Taylor committed 11 months agoba73442
  13. conflicts: propagate conflict labels down to materialization functionsScott Taylor committed 1 year ago9b9bdd0
  14. merge: implement IntoIterator for references of Merge<T>Yuya Nishihara committed 11 months ago3890c28
  15. conflicts: wrap materialized diff values in Diff<T>Yuya Nishihara committed 11 months agodd41f0e
  16. conflicts: add "diff-experimental" conflict marker styleScott Taylor committed 1 year agof08e50a
  17. conflicts: render exactly one snapshot in "diff" marker styleScott Taylor committed 1 year agoa16c89f
  18. cleanup: remove redundant + use<'_> after migrating to 2024 editionYuya Nishihara committed 1 year ago5f40f62
  19. merge: add a generic `Diff<T>` type, use in `TreeDiffEntry`Martin von Zweigbergk committed 1 year ago4f456ec
  20. cli_util: rename `Diff` to `ContentDiff`Martin von Zweigbergk committed 1 year ago452a1a4
  21. merge: remove Default from MergeOptionsYuya Nishihara committed 1 year ago8cd43d1
  22. cleanup: replace clippy allow() exemptions by expect()Martin von Zweigbergk committed 1 year ago8aa9d1d
  23. merged_tree: move MergeOptions to tree_mergeMartin von Zweigbergk committed 1 year ago92bc6e4
  24. files, tree: make same-change conflict resolution configurableYuya Nishihara committed 1 year agoaf4fe21
  25. files: rename FileMergeOptions to MergeOptions, move to merged_treeYuya Nishihara committed 1 year ago0376bcf
  26. files: introduce stub of FileMergeOptionsYuya Nishihara committed 1 year agoe9e9c6f
  27. conflicts: compare new hunks without fully materializing original to textYuya Nishihara committed 1 year ago4dee8e4
  28. backend: remove unused TreeValue::Conflict and read/write methodsMartin von Zweigbergk committed 1 year agoda6c4b6
  29. conflicts: pack marker style/len into struct, merge materialize functionsYuya Nishihara committed 1 year ago1cd6f9f
  30. cli, lib: move to Rust 2024 language editionAustin Seipp committed 1 year agoba24140
  31. cli lib: make use of `Self` consistentadamnemecek committed 1 year ago8a26df2
  32. cleanup: switch to async closures in trivial casesMartin von Zweigbergk committed 1 year agof27c55a
  33. local working copy: add support for EOL conversionKaiyi Li committed 1 year agof1f1556
  34. backend: add CopyId to TreeValue::FileMartin von Zweigbergk committed 1 year agoa363e6b
  35. async: bubble up async-ness from Backend::read_fileMartin von Zweigbergk committed 1 year agod2cf2cb

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