Code

History

Commits on ig/conflictsimp to cli/tests/test_diff_command.rs35+
  1. copies: ignore existing tree when testing copy/rename operation typeYuya Nishihara committed 1 year ago0e17c0e
  2. git_backend: do not include renamed trees in copy recordsYuya Nishihara committed 1 year agob6a861b
  3. diff: add option to render color-words diffs without materializing conflictsYuya Nishihara committed 2 years agob63ab33
  4. diff: test identical contents early when rendering color-words diffsYuya Nishihara committed 1 year ago8af238f
  5. tests: add samples of conflict diff renderingYuya Nishihara committed 1 year ago4ae00a6
  6. tests: add work_dir.dir(path), make create_dir*() return helper for sub dirYuya Nishihara committed 1 year agob000c94
  7. cleanup: enable `unused_trait_names` clippy lint and run `clippy --fix`Ilya Grigoriev committed 1 year agoacaedc3
  8. tests: port test_diff_command.rs to TestWorkDir APIYuya Nishihara committed 1 year ago31620a1
  9. tests: configure fake editor early in test_diff*_command.rsYuya Nishihara committed 1 year agofc84c63
  10. cli: diff: support multiple revisions to `-r`Martin von Zweigbergk committed 1 year agodc7216d
  11. tests: run `insta --force-update-snapshots`Ilya Grigoriev committed 1 year ago5eae2d9
  12. tests: resolve directory path to run_jj_in() relative to env_rootYuya Nishihara committed 1 year ago7fa8420
  13. tests: migrate unusual patterns of jj_cmd_ok() to run_jj_in()Yuya Nishihara committed 1 year agoad6985f
  14. tests: migrate non-snapshot users of jj_cmd_ok() to run_jj_in().success()Yuya Nishihara committed 1 year ago804d175
  15. tests: migrate snapshot users of jj_cmd_ok() to run_jj_in()Yuya Nishihara committed 1 year ago3193513
  16. tests: migrate snapshot users of jj_cmd_success() to run_jj_in()Yuya Nishihara committed 1 year agocdcc777
  17. tests: migrate unusual users of jj_cmd_success() to run_jj_in/with()Yuya Nishihara committed 1 year ago3179938
  18. tests: migrate jj_cmd_success() output wrappers to run_jj_in()Yuya Nishihara committed 1 year agoa326b6e
  19. tests: migrate callers of jj_cmd_cli_error() to run_jj_in()Yuya Nishihara committed 1 year agob79b29c
  20. tests: migrate some jj_cmd_success() output wrappers to run_jj_in()Yuya Nishihara committed 1 year agof1cd3a4
  21. tests: migrate users of strip_last_line() to run_jj_in() functionYuya Nishihara committed 1 year agoe23290d
  22. tests: migrate users of normalize_exit_status() to run_jj_in() functionYuya Nishihara committed 1 year agocf7f1df
  23. tests: add [EOF] marker to command output when displayingYuya Nishihara committed 1 year ago630036e
  24. tests: add CommandOutputString wrapperYuya Nishihara committed 1 year agoa541652
  25. diff: add `merge-tools.*.diff-expected-exit-codes`Bryce Berger committed 1 year agob1b2c62
  26. tests: use toml_edit to escape editor path, set ui.editor instead of $EDITORYuya Nishihara committed 2 years agod7e0ab6
  27. cli: refer to fileset argument using `FILESETS` in synopsisMartin von Zweigbergk committed 1 year agoa414441
  28. cli: replace --config-toml=TOML with --config=NAME=VALUEYuya Nishihara committed 1 year agoabf4857
  29. diff: fix unified diff to emit one-lower start line number for empty hunksYuya Nishihara committed 1 year ago8c4ba4a
  30. templates: align attributes in builtin_log_detailedVamsi Avula committed 1 year ago0794f87
  31. merge_tools: allow setting conflict marker style per-toolScott Taylor committed 1 year ago7f57866
  32. diff: Allow setting the default level of context in config.Dave Townsend committed 2 years ago891fa88
  33. cli: in color-words diffs, highlight word-level hunks in context linesYuya Nishihara committed 2 years ago68f4860
  34. cli: add diff --ignore-all-space/--ignore-space-change flagsYuya Nishihara committed 2 years ago6877ec4
  35. style: inline variables into format stringsSamuel Tardieu committed 2 years ago46e2723