Code

History

Commits on ig/docs-commitid to cli/src/merge_tools35+
  1. merged_tree: make `diff_stream()` sort `foo` before `foo/bar`Martin von Zweigbergk committed 1 year ago3211e9c
  2. merge-tools builtin: property-based test round-tripping partial changesJonas Greitemann committed 1 year ago0a208d8
  3. merge-tools builtin: add property-based testingJonas Greitemann committed 1 year ago94ba95b
  4. merge-tools builtin: introduce `assert_tree_eq!`Jonas Greitemann committed 1 year agoda2835b
  5. backend: add CopyId to TreeValue::FileMartin von Zweigbergk committed 1 year agoa363e6b
  6. merge-tools builtin: correctly set executable bit on binary files with selected changesJonas Greitemann committed 1 year ago1f3cf4a
  7. merge-tools builtin: update mode of files with unchanged contentsJonas Greitemann committed 1 year agoaebf681
  8. merge-tools builtin: omit changes of binary files if hash stayed the sameJonas Greitemann committed 1 year agof115662
  9. merge-tools builtin: only delete files from tree which used to existJonas Greitemann committed 1 year ago91ffb2a
  10. tests: supplement `create_tree()` with a builder-style APIJonas Greitemann committed 1 year ago9c165d6
  11. async: bubble up async-ness from Backend::read_fileMartin von Zweigbergk committed 1 year agod2cf2cb
  12. cli: add CommandNameAndArgs::as_str() helperYuya Nishihara committed 1 year agof0386e2
  13. diff: Run external diff tools in their temp dirEyvind Bernhardsen committed 1 year ago94f28e9
  14. merge-tools: builtin: refactor mapping of binary filesYuya Nishihara committed 1 year ago27a35a7
  15. merge-tools: builtin: parse conflict hunks back to merge valueYuya Nishihara committed 1 year ago6e67d79
  16. merge-tools: builtin: split apply_diff_builtin() functionYuya Nishihara committed 1 year agoacb4e27
  17. merge-tools: builtin: leverage materialized_diff_stream()Yuya Nishihara committed 1 year agoa3dcd8b
  18. merge-tools: builtin: do not include unchanged entry in test diffs, sort pathsYuya Nishihara committed 1 year agobe37209
  19. merge-tools: builtin: extract wrapper functions in testsYuya Nishihara committed 1 year ago9c723a1
  20. test: introduce test helpers for creating repo path typesMartin von Zweigbergk committed 1 year agof0545ee
  21. merge-tools: fix builtin merge editor to not ignore executable bitYuya Nishihara committed 1 year ago81b2f1a
  22. cli: resolve: do not use .with_new_file_ids() to construct resolved file valueYuya Nishihara committed 1 year agofa00775
  23. cli: resolve: error out early if conflict in exec bit couldn't be resolvedYuya Nishihara committed 1 year agoace0a52
  24. cli: resolve: update "not normal files" error message and formattingYuya Nishihara committed 1 year ago1e94ee2
  25. cli: resolve: use try_materialize_file_conflict_value()Yuya Nishihara committed 1 year agod2caf6f
  26. conflicts: pack MaterializedTreeValue::FileConflict fields into structYuya Nishihara committed 1 year agof047add
  27. files: rename merge() to merge_hunks()Yuya Nishihara committed 1 year ago624cb66
  28. merge_tools: fix `:ours` and `:theirs` merge toolsScott Taylor committed 1 year ago12add9b
  29. merge_tools: rename `content` to `simplified_file_content`Scott Taylor committed 1 year agoa7b112e
  30. cli external merge tools: add tracing when reparsing conflictsIlya Grigoriev committed 1 year agofa0b901
  31. merge_tools: add ":ours" and ":theirs" merge toolsScott Taylor committed 1 year agoa902e63
  32. merge_tools: split `DiffTool` and `MergeTool` enumsScott Taylor committed 1 year ago238a558
  33. conflicts: pack MaterializedTreeValue::File fields, use read_all() helperYuya Nishihara committed 1 year agoe52ddda
  34. diff-editor: Always use Section::FileMode when creating or deleting filesJonathan Gilchrist committed 1 year ago153c972
  35. cleanup: enable `unused_trait_names` clippy lint and run `clippy --fix`Ilya Grigoriev committed 1 year agoacaedc3