Martin von Zweigbergk 44eb902171 working_copy: don't crash when updating and tracked file exits on disk ... Before this patch, when updating to a commit that has a file that's currently an ignored file on disk, jj would crash. After this patch, we instead leave the conflicting files or directories on disk. We print a helpful message about how to inspect the differences between the intended working copy and the actual working copy, and how to discard the unintended changes. Closes #976.		2023-10-07 14:02:31 -07:00
..
commands	working_copy: don't crash when updating and tracked file exits on disk	2023-10-07 14:02:31 -07:00
config	cli: enable tree-level conflicts by default	2023-10-05 10:31:47 -07:00
merge_tools	working_copy: rename to local_working_copy	2023-10-07 08:19:03 -07:00
cleanup_guard.rs
cli_util.rs	working_copy: don't crash when updating and tracked file exits on disk	2023-10-07 14:02:31 -07:00
commit_templater.rs	git: look up "git" remote branches normally	2023-10-07 19:33:35 +09:00
config-schema.json	cli: redefine default log revset using immutable_heads()	2023-10-01 11:15:30 -07:00
config.rs	revsets: add trunk alias with default to main/master/root	2023-09-17 10:17:23 +10:00
diff_util.rs	merge_tools: enable :builtin as default diff/merge editor	2023-09-21 03:29:27 +02:00
formatter.rs
graphlog.rs
lib.rs
main.rs
operation_templater.rs
progress.rs
template.pest	Allow \0 escape for nulls	2023-09-14 17:11:05 -04:00
template_builder.rs
template_parser.rs	Allow \0 escape for nulls	2023-09-14 17:11:05 -04:00
templater.rs
text_util.rs
time_util.rs
ui.rs