Ilya Grigoriev e3fd49993e Add a default merge tool config for meld, vimdiff, kdiff3.		2022-12-03 15:12:40 -08:00
..
cleanup_guard.rs
cli_util.rs	New jj resolve command to resolve conflicts	2022-12-03 15:12:40 -08:00
commands.rs	New jj resolve command to resolve conflicts	2022-12-03 15:12:40 -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	jj resolve: option to parse conflict markers + tests	2022-12-03 15:12:40 -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	cli: split pager arguments like ui.editor	2022-12-02 15:44:10 +09:00