Code

History

Commits on wd/combined-diff to cli/tests/test_diff_command.rs35+
  1. cli: support combined diff in :git style diffYuantao Wang committed 9 months ago4f1592e
  2. test: use our own echo binary in testsKaiyi Li committed 10 months ago0d91f18
  3. cli: remove newline addition between template and contentDavid Higgs committed 10 months ago2234702
  4. templates: add "divergent" label to log for divergent changesScott Taylor committed 11 months ago33ad38b
  5. rewrite: add conflict labels when merging commit treesScott Taylor committed 1 year ago04a9121
  6. conflicts: update conflict marker formatScott Taylor committed 11 months agoba73442
  7. revset: enable glob string matching by defaultYuya Nishihara committed 12 months ago97375fa
  8. diff: reduce intensity of context line numbers in color-words diffsYuya Nishihara committed 11 months ago2f9041b
  9. config: remove outdated migration rulesYuya Nishihara committed 11 months agoc6cc177
  10. tests: exercise reverse order diff and --toDavid Higgs committed 11 months agoee650cb
  11. docs: jj-vcs.github.io -> jj-vcs.devSteve Klabnik committed 11 months ago5b3aa51
  12. tests: specify string pattern prefix, use subject(glob:_) accordinglyYuya Nishihara committed 12 months ago3b37ed1
  13. cli: diff: pass $width parameter to external diff toolsYuya Nishihara committed 1 year ago84c7f5d
  14. cli: make diff --stat show byte counts for binary filesEvan Martin committed 1 year ago60a6e94
  15. cli, lib: move to Rust 2024 language editionAustin Seipp committed 1 year agoba24140
  16. diff: disallow diff of range with incoming merge edgesMartin von Zweigbergk committed 1 year agoa054ca9
  17. cli: demonstrate bug in `jj diff -r` with merge into chainMartin von Zweigbergk committed 1 year ago3423543
  18. diff stat: ensure bar always has 2 spaces for commits with adds and removesBryce Berger committed 1 year ago38a23f9
  19. diff tests: demonstrate bug in --stat with narrow terminal, adds, and removesBryce Berger committed 1 year ago2c84812
  20. cli merge tools: allow setting `diff-args=[]` to disable diff formatting with a toolIlya Grigoriev committed 1 year agofedbc30
  21. cli: make diff --stat fill available widthEvan Martin committed 1 year agod9b0a42
  22. tests: make `diff --stat` test filenames clearerEvan Martin committed 1 year ago228ea38
  23. cli: add "diff --template" argumentYuya Nishihara committed 1 year ago26ba2a0
  24. cli: for deprecated configs, say at which source level they were foundMartin von Zweigbergk committed 1 year ago98d8848
  25. cli: accept --tool=:<format> argument as builtin diff formatYuya Nishihara committed 1 year ago88d79c1
  26. cli: unify diff format/tool config variablesYuya Nishihara committed 1 year ago851d25c
  27. diff: Run external diff tools in their temp dirEyvind Bernhardsen committed 1 year ago94f28e9
  28. files: make DiffLineIterator omit blank right line following matching+leftYuya Nishihara committed 1 year ago79fb219
  29. tests: demonstrate redundant right blank lines in color-words diffsYuya Nishihara committed 1 year ago3929523
  30. git: write change-id header by defaultMartin von Zweigbergk committed 1 year agoacd8242
  31. copies: ignore existing tree when testing copy/rename operation typeYuya Nishihara committed 1 year ago0e17c0e
  32. git_backend: do not include renamed trees in copy recordsYuya Nishihara committed 1 year agob6a861b
  33. diff: add option to render color-words diffs without materializing conflictsYuya Nishihara committed 2 years agob63ab33
  34. diff: test identical contents early when rendering color-words diffsYuya Nishihara committed 1 year ago8af238f
  35. tests: add samples of conflict diff renderingYuya Nishihara committed 1 year ago4ae00a6