Scott Taylor 7df0f16fe0 resolve: try to resolve all conflicted files in fileset ... If many files are conflicted, it would be nice to be able to resolve all conflicts at once without having to run `jj resolve` multiple times. This is especially nice for merge tools which try to automatically resolve conflicts without user input, but it is also good for regular merge editors like VS Code. This change makes the behavior of `jj resolve` more consistent with other commands which accept filesets since it will use the entire fileset instead of picking an arbitrary file from the fileset. Since we don't support passing directories to merge tools yet, the current implementation just calls the merge tool repeatedly in a loop until every file is resolved, or until an error occurs. If an error occurs after successfully resolving at least one file, the transaction is committed with all of the successful changes before returning the error. This means the user can just close the editor at any point to cancel resolution on all remaining files.		2025-01-08 23:52:21 +00:00
..
examples	examples: use settings_for_new_workspace() when initializing workspace	2025-01-06 21:15:28 +09:00
src	resolve: try to resolve all conflicted files in fileset	2025-01-08 23:52:21 +00:00
testing	merge_tools: add "$marker_length" variable	2024-12-23 08:42:10 -06:00
tests	resolve: try to resolve all conflicted files in fileset	2025-01-08 23:52:21 +00:00
build.rs	build: fix cargo publish by symlinking cli/docs->docs	2024-11-05 17:37:14 -08:00
Cargo.toml	cli: make git support optional	2025-01-08 22:02:21 +00:00
docs	build: fix cargo publish by symlinking cli/docs->docs	2024-11-05 17:37:14 -08:00
LICENSE