Ilya Grigoriev ea1395ad95 Make optional the path argument to resolve, allow partial paths ... Also allows several paths to be specified. By default, `jj resolve` will find the first conflict that matches provided paths (if any) and try to resolve it.		2022-12-04 22:39:45 -08:00
..
cleanup_guard.rs	cli: define drop+signal guard helper	2022-11-06 18:15:22 -08:00
cli_util.rs	Make optional the path argument to resolve, allow partial paths	2022-12-04 22:39:45 -08:00
commands.rs	Make optional the path argument to resolve, allow partial paths	2022-12-04 22:39:45 -08:00
config.rs	Add a default merge tool config for meld, vimdiff, kdiff3.	2022-12-03 15:12:40 -08:00
diff_edit.rs	Mention path in message for ConflictResolveError::NotNormalFilesError.	2022-12-04 22:39:45 -08:00
formatter.rs	copyright: change from "Google LLC" to "The Jujutsu Authors"	2022-11-28 06:05:45 -10:00
graphlog.rs	copyright: change from "Google LLC" to "The Jujutsu Authors"	2022-11-28 06:05:45 -10:00
lib.rs	copyright: change from "Google LLC" to "The Jujutsu Authors"	2022-11-28 06:05:45 -10:00
main.rs	ui: add pager	2022-11-30 06:14:39 +08:00
progress.rs	cli: fix rebase error	2022-11-06 18:50:58 -08:00
template.pest	copyright: change from "Google LLC" to "The Jujutsu Authors"	2022-11-28 06:05:45 -10:00
template_parser.rs	copyright: change from "Google LLC" to "The Jujutsu Authors"	2022-11-28 06:05:45 -10:00
templater.rs	copyright: change from "Google LLC" to "The Jujutsu Authors"	2022-11-28 06:05:45 -10:00
ui.rs	pager: default to less -FRX	2022-12-04 00:00:31 -08:00