2 commits

Author	SHA1	Message	Date
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
Martin von Zweigbergk	0075174308	tests: move tests/ under cli/ so they're run again ... Thanks to @ilyagr for noticing that they should be moved.	2023-08-05 06:18:59 +00:00

Renamed from tests/test_gitignores.rs (Browse further)