Code

History

Commits on ig/commit-debug to cli/src/merge_tools/diff_working_copies.rs24
  1. cli: merge-tools: simply build map of owned substitution variablesYuya Nishihara committed 1 year agof4fe07b
  2. cli: diff: pass left/right trees as array to reduce number of argumentsYuya Nishihara committed 1 year ago91e5bef
  3. cli: merge-tools: make check_out_trees() get store from MergedTreeYuya Nishihara committed 1 year agod9552c4
  4. local_working_copy: remove Default from TreeStateSettingsYuya Nishihara committed 1 year ago79a2a77
  5. working_copy: Move `FsmonitorSettings` to `TreeStateSettings` and add test method to update settingsIan Wrzesinski committed 1 year ago5f6f938
  6. working_copy: Move `conlfict_marker_styles` to `TreeState`Ian Wrzesinski committed 1 year agof3d41b1
  7. diff_working_copies: Simplify tree checkout functionsIan Wrzesinski committed 1 year agoab8bf20
  8. cli, lib: move to Rust 2024 language editionAustin Seipp committed 1 year agoba24140
  9. working copy: pass `UserSettings` to `WorkingCopyFactory`Kaiyi Li committed 1 year ago74fb5a6
  10. diff: Run external diff tools in their temp dirEyvind Bernhardsen committed 1 year ago94f28e9
  11. cleanup: enable `unused_trait_names` clippy lint and run `clippy --fix`Ilya Grigoriev committed 1 year agoacaedc3
  12. conflicts: add "ui.conflict-marker-style" configScott Taylor committed 1 year agoe5cb9f9
  13. cli: make paths to auto-track configurable, add `jj track`Martin von Zweigbergk committed 2 years agof36f4ad
  14. working_copy: pass SnapshotOptions by referenceYuya Nishihara committed 2 years ago4730755
  15. cleanup: remove redundant ::{self} from use declarationsYuya Nishihara committed 2 years ago87fb169
  16. formatting only: switch to Item level import ganularityMatt Kulukundis committed 2 years ago8ead72e
  17. merged_tree: remove `TreeDiffEntry::source`Martin von Zweigbergk committed 2 years ago3acb89e
  18. merged_tree: provide separate version of `diff_stream()` with copy infoMartin von Zweigbergk committed 2 years ago7059849
  19. copy-tracking: plumb CopyRecordMap through diff methodMatt Kulukundis committed 2 years ago34b0f87
  20. copy-tracking: create an explicit TreeDiffEntry structMatt Kulukundis committed 2 years ago8e84c60
  21. feat: add an option to monitor the filesystem asynchronouslyMatt Kulukundis committed 2 years ago8aa71f5
  22. merge tools: split DiffEditWorkingCopies from DiffWorkingCopiesIlya Grigoriev committed 2 years ago8600750
  23. merge tools: rename variable to make diff for the next commit simplerIlya Grigoriev committed 2 years ago6a63c70
  24. external diff editor: move utility functions to a new fileIlya Grigoriev committed 2 years ago0120cf9