Code

History

Commits on ig/commit-debug to cli/src/merge_tools/external.rs35+
  1. external_merge: pass the repo_path to the merge toolAntonin Delpeuch committed 1 year ago589ed83
  2. cli: diff: pass $width parameter to external diff toolsYuya Nishihara committed 1 year ago84c7f5d
  3. cli: merge-tools: simply build map of owned substitution variablesYuya Nishihara committed 1 year agof4fe07b
  4. cli: diff: pass left/right trees as array to reduce number of argumentsYuya Nishihara committed 1 year ago91e5bef
  5. cli: merge-tools: make check_out_trees() get store from MergedTreeYuya Nishihara committed 1 year agod9552c4
  6. files: rename FileMergeOptions to MergeOptions, move to merged_treeYuya Nishihara committed 1 year ago0376bcf
  7. files: introduce stub of FileMergeOptionsYuya Nishihara committed 1 year agoe9e9c6f
  8. codespell: forbid British EnglishIlya Grigoriev committed 1 year ago93368f1
  9. conflicts: compare new hunks without fully materializing original to textYuya Nishihara committed 1 year ago4dee8e4
  10. conflicts: pack marker style/len into struct, merge materialize functionsYuya Nishihara committed 1 year ago1cd6f9f
  11. working_copy: Move `conlfict_marker_styles` to `TreeState`Ian Wrzesinski committed 1 year agof3d41b1
  12. diff_working_copies: Simplify tree checkout functionsIan Wrzesinski committed 1 year agoab8bf20
  13. cli, lib: move to Rust 2024 language editionAustin Seipp committed 1 year agoba24140
  14. backend: add CopyId to TreeValue::FileMartin von Zweigbergk committed 1 year agoa363e6b
  15. diff: Run external diff tools in their temp dirEyvind Bernhardsen committed 1 year ago94f28e9
  16. cli: resolve: do not use .with_new_file_ids() to construct resolved file valueYuya Nishihara committed 1 year agofa00775
  17. cli: resolve: use try_materialize_file_conflict_value()Yuya Nishihara committed 1 year agod2caf6f
  18. merge_tools: fix `:ours` and `:theirs` merge toolsScott Taylor committed 1 year ago12add9b
  19. merge_tools: rename `content` to `simplified_file_content`Scott Taylor committed 1 year agoa7b112e
  20. cli external merge tools: add tracing when reparsing conflictsIlya Grigoriev committed 1 year agofa0b901
  21. cleanup: enable `unused_trait_names` clippy lint and run `clippy --fix`Ilya Grigoriev committed 1 year agoacaedc3
  22. cli: resolve: leave executable bit unchanged when using external toolMartin von Zweigbergk committed 1 year agoa01d0bf
  23. resolve: try to resolve all conflicted files in filesetScott Taylor committed 1 year ago7df0f16
  24. merge_tools: extract `MergeToolFile` structScott Taylor committed 1 year ago5f77edf
  25. diff: add `merge-tools.*.diff-expected-exit-codes`Bryce Berger committed 1 year agob1b2c62
  26. perf: use `.next_back()` to get the last componentSamuel Tardieu committed 1 year ago39bdd5e
  27. merge_tools: add "$marker_length" variableScott Taylor committed 1 year ago542d09c
  28. merge_tools: preserve executable bit on resolveScott Taylor committed 1 year ago7bf31c1
  29. local_working_copy: store materialized conflict marker lengthScott Taylor committed 1 year ago6baa436
  30. merge_tools: add merge-conflict-exit-codes optionScott Taylor committed 1 year agofa7d9c0
  31. merge_tools: allow setting conflict marker style per-toolScott Taylor committed 1 year ago7f57866
  32. conflicts: add "ui.conflict-marker-style" configScott Taylor committed 1 year agoe5cb9f9
  33. conflicts: extract materialize_merge_result_to_bytes() helperYuya Nishihara committed 2 years ago59a79fd
  34. repo_path: add stub for checked to_fs_path(), rename unchecked functionsYuya Nishihara committed 2 years ago739bf8d
  35. store: make `write_file()` asyncMartin von Zweigbergk committed 2 years ago4a8d250