Code

History

Commits on git-sync to cli/src/diff_util.rs234
  1. merged_tree: propagate backend errors in diff iteratorMartin von Zweigbergk committed 3 years agoa1ef9dc
  2. merge: introduce a type alias for `Merge<Option<TreeValue>>`Martin von Zweigbergk committed 3 years ago309f120
  3. conflicts: make materialization asyncMartin von Zweigbergk committed 3 years ago8764ad9
  4. merge_tools: enable `:builtin` as default diff/merge editorWaleed Khan committed 3 years ago409356f
  5. cli: make diff stat calculate path length based on unicode widthYuya Nishihara committed 3 years ago1c7d2b9
  6. cli: trim path in diff stat if it's long, to give room for statMartin von Zweigbergk committed 3 years agob18c97a
  7. cli: make diff stat determine path length in chars, not bytesMartin von Zweigbergk committed 3 years ago5ecc95a
  8. cli: don't crash diffstat on very narrow terminalsMartin von Zweigbergk committed 3 years ago4377c08
  9. cli: reuse `number_padding` instead of calculating twice in diff statMartin von Zweigbergk committed 3 years ago5a054fc
  10. cli: allow diff stat bar to be one character longerMartin von Zweigbergk committed 3 years ago5ce4ed4
  11. cli: fix crash on diff stat with long path nameMartin von Zweigbergk committed 3 years ago9395281
  12. commit: drop `merged_` prefix from `tree()` and `tree_id()`Martin von Zweigbergk committed 3 years ago145b0b2
  13. rewrite: return `MergedTree` from `merge_commit_trees()`Martin von Zweigbergk committed 3 years ago90e78a1
  14. diff_util: use `MergedTree` throughoutMartin von Zweigbergk committed 3 years ago732e448
  15. diff_util: make `diff_content()` return empty for missing pathMartin von Zweigbergk committed 3 years ago5309335
  16. diff_util: unify handling of unexpected casesMartin von Zweigbergk committed 3 years ago5ef925d
  17. merge_tools: pass `MergedTree`s to `edit_diff()`Martin von Zweigbergk committed 3 years ago17fe5e3
  18. Fix docs for diff --statOscar Bonilla committed 3 years ago30c2a21
  19. Add jj diffs --stat optionOscar Bonilla committed 3 years ago5bd726f
  20. merge_tools: rename `MergeTool` -> `ExternalMergeTool`Waleed Khan committed 3 years agoc572c1a
  21. cli: indicate empty files in default diff formatMartin von Zweigbergk committed 3 years ago00d2d2d
  22. merge: move some methods back to `conflicts` as free functionsMartin von Zweigbergk committed 3 years agoa995c66
  23. cli: pass ui in to merge_tools::generate_diff()Yuya Nishihara committed 3 years ago9dbadda
  24. cli: move src/ directory to new cli/ directoryAustin Seipp committed 3 years ago48fa821

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t