Code

History

Commits on ig/commit-debug to cli/src/merge_tools35+
  1. external_merge: pass the repo_path to the merge toolAntonin Delpeuch committed 1 year ago589ed83
  2. cleanup: use method version of str::from_utf8()Yuya Nishihara committed 1 year ago744631d
  3. cli_util: rename `Diff` to `ContentDiff`Martin von Zweigbergk committed 1 year ago452a1a4
  4. cargo: bump MSRV to 1.88Austin Seipp committed 1 year ago419bd51
  5. cli: diff: pass $width parameter to external diff toolsYuya Nishihara committed 1 year ago84c7f5d
  6. cli: merge-tools: simply build map of owned substitution variablesYuya Nishihara committed 1 year agof4fe07b
  7. cli: diff: pass left/right trees as array to reduce number of argumentsYuya Nishihara committed 1 year ago91e5bef
  8. cli: merge-tools: make check_out_trees() get store from MergedTreeYuya Nishihara committed 1 year agod9552c4
  9. local_working_copy: remove Default from TreeStateSettingsYuya Nishihara committed 1 year ago79a2a77
  10. merged_tree: move MergeOptions to tree_mergeMartin von Zweigbergk committed 1 year ago92bc6e4
  11. files: rename FileMergeOptions to MergeOptions, move to merged_treeYuya Nishihara committed 1 year ago0376bcf
  12. working_copy: Move `FsmonitorSettings` to `TreeStateSettings` and add test method to update settingsIan Wrzesinski committed 1 year ago5f6f938
  13. files: introduce stub of FileMergeOptionsYuya Nishihara committed 1 year agoe9e9c6f
  14. codespell: forbid British EnglishIlya Grigoriev committed 1 year ago93368f1
  15. conflicts: compare new hunks without fully materializing original to textYuya Nishihara committed 1 year ago4dee8e4
  16. conflicts: pack marker style/len into struct, merge materialize functionsYuya Nishihara committed 1 year ago1cd6f9f
  17. working_copy: Move `conlfict_marker_styles` to `TreeState`Ian Wrzesinski committed 1 year agof3d41b1
  18. diff_working_copies: Simplify tree checkout functionsIan Wrzesinski committed 1 year agoab8bf20
  19. cli, lib: move to Rust 2024 language editionAustin Seipp committed 1 year agoba24140
  20. cli lib: make use of `Self` consistentadamnemecek committed 1 year ago8a26df2
  21. merge_tools: builtin: preserve unmatched paths from right treeGeorge Christou committed 1 year agof20e99b
  22. cli merge tools: allow setting `edit-args=[]` to disable diff editing with a toolIlya Grigoriev committed 1 year agodae9ce7
  23. cli merge tools: rename internal `DiffTool` type to `DiffEditTool`Ilya Grigoriev committed 1 year ago1b16132
  24. working copy: pass `UserSettings` to `WorkingCopyFactory`Kaiyi Li committed 1 year ago74fb5a6
  25. cli completion: complete `--tool` args for merge toolsIlya Grigoriev committed 1 year ago1161e95
  26. merged_tree: make `diff_stream()` sort `foo` before `foo/bar`Martin von Zweigbergk committed 1 year ago3211e9c
  27. merge-tools builtin: property-based test round-tripping partial changesJonas Greitemann committed 1 year ago0a208d8
  28. merge-tools builtin: add property-based testingJonas Greitemann committed 1 year ago94ba95b
  29. merge-tools builtin: introduce `assert_tree_eq!`Jonas Greitemann committed 1 year agoda2835b
  30. backend: add CopyId to TreeValue::FileMartin von Zweigbergk committed 1 year agoa363e6b
  31. merge-tools builtin: correctly set executable bit on binary files with selected changesJonas Greitemann committed 1 year ago1f3cf4a
  32. merge-tools builtin: update mode of files with unchanged contentsJonas Greitemann committed 1 year agoaebf681
  33. merge-tools builtin: omit changes of binary files if hash stayed the sameJonas Greitemann committed 1 year agof115662
  34. merge-tools builtin: only delete files from tree which used to existJonas Greitemann committed 1 year ago91ffb2a
  35. tests: supplement `create_tree()` with a builder-style APIJonas Greitemann committed 1 year ago9c165d6