History

Commits on cdcee0faaefd089cb28f8af56b0a94de44ca9a62 to cli/tests/test_diffedit_command.rs35+

local working copy: add support for EOL conversionKaiyi Li committed 1 year agof1f1556
git: write change-id header by defaultMartin von Zweigbergk committed 1 year agoacd8242
restore, diffedit: do not output "Created ..." message, which dates back to before we couldn't lookup by change id.Steve Fink committed 1 year ago0eceed9
cli: Print @ and @- in status and print_updated_working_copy_statsRobin Stocker committed 1 year ago0456701
cli: do not print commit summary for previously-conflicted commitsYuya Nishihara committed 1 year ago00c2d15
tests: port test_diffedit_command.rs to TestWorkDir APIYuya Nishihara committed 1 year agoaeb80d2
tests: configure fake editor early in test_diff*_command.rsYuya Nishihara committed 1 year agofc84c63
tests: run `insta --force-update-snapshots`Ilya Grigoriev committed 1 year ago5eae2d9
tests: resolve directory path to run_jj_in() relative to env_rootYuya Nishihara committed 1 year ago7fa8420
tests: migrate non-snapshot users of jj_cmd_ok() to run_jj_in().success()Yuya Nishihara committed 1 year ago804d175
tests: migrate snapshot users of jj_cmd_ok() to run_jj_in()Yuya Nishihara committed 1 year ago3193513
tests: migrate snapshot users of jj_cmd_success() to run_jj_in()Yuya Nishihara committed 1 year agocdcc777
tests: migrate users of normalize_exit_status() to run_jj_in() functionYuya Nishihara committed 1 year agocf7f1df
cli: render "conflicts" message as warningYuya Nishihara committed 1 year agoa2a9a99
cli: status: reorder conflict message to match checkout statsYuya Nishihara committed 1 year ago067e2eb
tests: add [EOF] marker to command output when displayingYuya Nishihara committed 1 year ago630036e
tests: add CommandOutputString wrapperYuya Nishihara committed 1 year agoa541652
bookmarks: First step to make target revision a required argument to bookmark create/move/set.David Rieber committed 1 year agodd73b5a
cli: status: replace "is clean" by "has no changes"Martin von Zweigbergk committed 1 year ago1e25101
tests: leverage set_up_fake_diff_editor() in test_diffedit_3pane()Yuya Nishihara committed 2 years ago124970c
docs/cli: update URLs to from martinvonz user to jj-vcs orgMartin von Zweigbergk committed 1 year agob836e0a
cli: replace --config-toml=TOML with --config=NAME=VALUEYuya Nishihara committed 1 year agoabf4857
diff: fix unified diff to emit one-lower start line number for empty hunksYuya Nishihara committed 1 year ago8c4ba4a
merge_tools: allow setting conflict marker style per-toolScott Taylor committed 1 year ago7f57866
diffedit: add --restore-descendants flagSamuel Tardieu committed 2 years agof76ee18
everything: Rename `branches` to `bookmarks`Philip Metzger committed 2 years agod9c68e0
formatting only: switch to Item level import ganularityMatt Kulukundis committed 2 years ago8ead72e
copy-tracking: add support for `diff --git`Matt Kulukundis committed 2 years ago95e8dd5
diff: fix typo in Git diff "index old..new" headerYuya Nishihara committed 2 years ago07a6a80
cli: skip formatting instructions if not requiredScott Taylor committed 2 years agob27ff28
commit_builder: reset author timestamp on discardable commitsScott Taylor committed 2 years ago1eebbe5
cli: rename `jj file print` (formerly `jj cat`) to `jj file show`Ilya Grigoriev committed 2 years agoe6c2108
feat: Create a `file` command containing `print` and `chmod`Matt Kulukundis committed 2 years ago47bd6f4
conflicts: label closing delimeter with conflict numberIlya Grigoriev committed 2 years ago1f7c4ec
tests: avoid deprecated `jj init --git/--git-repo`Martin von Zweigbergk committed 2 years agofe9daac