Code

History

Commits on imogen to cli/src/diff_util.rs35+
  1. cli: diff: add generic symbol extraction ruleYuya Nishihara committed 1 month ago987c084
  2. rewrite: make rebase_to_dest_parent() take index instead of repoMartin von Zweigbergk committed 1 month agoec36c2a
  3. commit: make parent_tree() take index instead of repoMartin von Zweigbergk committed 1 month ago0b32255
  4. diff: don't number resolved sides in color-words "pair" hunk headersMartin von Zweigbergk committed 1 month ago334ceab
  5. diff: show conflict labels in color-words "pair" hunk headersMartin von Zweigbergk committed 1 month ago3dbc261
  6. cli: diff: rename context after/before variables to leading/trailingYuya Nishihara committed 1 month ago030ecf2
  7. cli: diff: omit color-words context symbol if new symbol immediately followsYuya Nishihara committed 1 month agob59311d
  8. cli: diff: show omitted symbol lines alongside ellipses in color-words diffsYuya Nishihara committed 1 month ago6c4bb8f
  9. cli: diff: pass source language down to color-words context functionYuya Nishihara committed 1 month ago70c0968
  10. cli: merge_tools: remove UTF-8 requirement for temp directoriesYuya Nishihara committed 1 month ago081fd57
  11. cli: diff: add missing diff-type labels to text diffsYuya Nishihara committed 2 months ago9632abb
  12. cli: diff: extract show_diff_bytes() to free functionYuya Nishihara committed 2 months agob91d33d
  13. cli: diff: resolve ConflictMaterializeOptions by callerYuya Nishihara committed 2 months ago49eec66
  14. cli: diff: add public show_text_diff() helperYuya Nishihara committed 2 months agoc5a88f8
  15. diff: add function names to git hunk headersGabriel Goller committed 4 months ago7b039df
  16. lib: turn inherent `Merge` impls into extension traitsMartin von Zweigbergk committed 2 months ago6398bfe
  17. repo_path: move RepoPathUiConverter to separate moduleMartin von Zweigbergk committed 3 months ago7190eda
  18. lib: move TreeValue-specific Merge impls to backend moduleMartin von Zweigbergk committed 3 months agod89eca0
  19. cli: add option to limit diff stat bar widthivelieu committed 3 months ago9f9e3e9
  20. diff: avoid word inlining without colorJakub Stasiak committed 5 months ago92b7af4
  21. diff.git: Add a show-path-prefix option to disable a/ and b/ prefixesjonmeow committed 7 months ago09ede03
  22. cli: make diff_util::get_copy_records() asyncYuya Nishihara committed 8 months agodff1e74
  23. cli: diff: insert format name to color labelsYuya Nishihara committed 8 months ago8f24605
  24. cli: diff: propagate future from diff_content()Yuya Nishihara committed 8 months agoa95bee7
  25. lib: make a few more functions asyncAustin Seipp committed 8 months ago5ae2acc
  26. merge_tools: make asyncMartin von Zweigbergk committed 8 months ago7acd15d
  27. cli: remove some redundant block_on() callsAustin Seipp committed 8 months agob27e4d8
  28. commit: delete sync version of parent_tree()Martin von Zweigbergk committed 8 months agod518716
  29. rewrite: make all functions asyncMartin von Zweigbergk committed 9 months ago9d62d0d
  30. clippy: fix unnecessary_semicolon lintxtqqczze committed 9 months agocbe8b79
  31. commands: extract completer configuration to separate arg() attributesYuya Nishihara committed 10 months agof4fc391
  32. commands: insert blank line between args struct fieldsYuya Nishihara committed 10 months agof7efb3b
  33. merge: include conflict labels when describing non-file conflictsScott Taylor committed 10 months ago34a1f86
  34. merge: add `Diff::invert` methodScott Taylor committed 11 months ago5c7d0b0
  35. repo_path: use Diff<T> to specify copied source/target pathsYuya Nishihara committed 11 months ago79cefeb