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
..
examples	backend: move constant functions first	2023-09-19 05:24:51 -07:00
src	working_copy: don't crash when updating and tracked file exits on disk	2023-10-07 14:02:31 -07:00
testing	fake_diff_editor: Allow specifying extra arguments to be ignored	2023-08-21 20:19:15 -07:00
tests	working_copy: don't crash when updating and tracked file exits on disk	2023-10-07 14:02:31 -07:00
build.rs	build: update rerun-if conditions to watch .git/HEAD in colocated repo	2023-08-06 12:16:11 +09:00
Cargo.toml	cargo: make jj installable with cargo binstall	2023-09-20 09:35:18 -07:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00