1004 commits

Author	SHA1	Message	Date
Ilya Grigoriev	9e08b52d55	merge_tools: make dirs readonly for external difftool ... As far as I understand, the difftool is supposed to be readonly, so let's encourage people to no edit the files being diffed.	2023-08-07 17:17:35 -07:00
Martin von Zweigbergk	ef5f97f8d7	conflicts: move Merge<T> to merge module ... The `merge` module now seems like the obvious place for this type.	2023-08-06 22:08:09 +00:00
Martin von Zweigbergk	ecc030848d	conflicts: rename Conflict<T> to Merge<T> ... Since `Conflict<T>` can also represent a non-conflict state (a single term), `Merge<T>` seems like better name. Thanks to @ilyagr for the suggestion in https://github.com/martinvonz/jj/pull/1774#discussion_r1257547709 Sorry about the churn. It would have been better if I thought of this name before I introduced `Conflict<T>`.	2023-08-06 22:08:09 +00:00
Austin Seipp	48fa821e60	cli: move src/ directory to new cli/ directory ... Summary: In preparation for unifying all workspace dependencies across all crates, let's go ahead and move the jj-cli crate into its own new directory. This will also be a nicer and more uniform layout as we add new `jj-*` crates. Signed-off-by: Austin Seipp <aseipp@pobox.com> Change-Id: Icf94e7ae5f290dc8e181215727b38ada	2023-08-04 19:00:42 -05:00