Code

History

Commits on colocated-workspaces to cli/tests/test_diff_command.rs35+
  1. logging: Add trailing periods in log messagesJoseph Lou committed 4 months agod6c4fa8
  2. diff: avoid word inlining without colorJakub Stasiak committed 5 months ago92b7af4
  3. diff.git: Add a show-path-prefix option to disable a/ and b/ prefixesjonmeow committed 7 months ago09ede03
  4. tests: Replace Result.unwrap with ? operator in test functionsGaëtan Lehmann committed 7 months agoacee40c
  5. cli: diff: insert format name to color labelsYuya Nishihara committed 8 months ago8f24605
  6. tests: run `cargo insta test --force-update-snapshots`Ilya Grigoriev committed 8 months ago3a9e56d
  7. git_backend: use first tree as base tree for conflictsScott Taylor committed 1 year agoc1ecf8a
  8. cargo: update a bunch of various dependenciesAustin Seipp committed 9 months ago9a53a8c
  9. test: use our own echo binary in testsKaiyi Li committed 10 months ago0d91f18
  10. cli: remove newline addition between template and contentDavid Higgs committed 10 months ago2234702
  11. templates: add "divergent" label to log for divergent changesScott Taylor committed 11 months ago33ad38b
  12. rewrite: add conflict labels when merging commit treesScott Taylor committed 1 year ago04a9121
  13. conflicts: update conflict marker formatScott Taylor committed 11 months agoba73442
  14. revset: enable glob string matching by defaultYuya Nishihara committed 12 months ago97375fa
  15. diff: reduce intensity of context line numbers in color-words diffsYuya Nishihara committed 11 months ago2f9041b
  16. config: remove outdated migration rulesYuya Nishihara committed 11 months agoc6cc177
  17. tests: exercise reverse order diff and --toDavid Higgs committed 11 months agoee650cb
  18. docs: jj-vcs.github.io -> jj-vcs.devSteve Klabnik committed 11 months ago5b3aa51
  19. tests: specify string pattern prefix, use subject(glob:_) accordinglyYuya Nishihara committed 12 months ago3b37ed1
  20. cli: diff: pass $width parameter to external diff toolsYuya Nishihara committed 1 year ago84c7f5d
  21. cli: make diff --stat show byte counts for binary filesEvan Martin committed 1 year ago60a6e94
  22. cli, lib: move to Rust 2024 language editionAustin Seipp committed 1 year agoba24140
  23. diff: disallow diff of range with incoming merge edgesMartin von Zweigbergk committed 1 year agoa054ca9
  24. cli: demonstrate bug in `jj diff -r` with merge into chainMartin von Zweigbergk committed 1 year ago3423543
  25. diff stat: ensure bar always has 2 spaces for commits with adds and removesBryce Berger committed 1 year ago38a23f9
  26. diff tests: demonstrate bug in --stat with narrow terminal, adds, and removesBryce Berger committed 1 year ago2c84812
  27. cli merge tools: allow setting `diff-args=[]` to disable diff formatting with a toolIlya Grigoriev committed 1 year agofedbc30
  28. cli: make diff --stat fill available widthEvan Martin committed 1 year agod9b0a42
  29. tests: make `diff --stat` test filenames clearerEvan Martin committed 1 year ago228ea38
  30. cli: add "diff --template" argumentYuya Nishihara committed 1 year ago26ba2a0
  31. cli: for deprecated configs, say at which source level they were foundMartin von Zweigbergk committed 1 year ago98d8848
  32. cli: accept --tool=:<format> argument as builtin diff formatYuya Nishihara committed 1 year ago88d79c1
  33. cli: unify diff format/tool config variablesYuya Nishihara committed 1 year ago851d25c
  34. diff: Run external diff tools in their temp dirEyvind Bernhardsen committed 1 year ago94f28e9
  35. files: make DiffLineIterator omit blank right line following matching+leftYuya Nishihara committed 1 year ago79fb219