Martin von Zweigbergk a995c66635 merge: move some methods back to conflicts as free functions ... I think I moved way too many functions onto `Merge<Option<TreeValue>>` in 82883e648d. This effectively reverts almost all of that commit. The `Merge<T>` type is simple container and it seems like it should be at fairly low level in the dependency graph. By moving functions off of it, we can get rid of the back-depdencies from the `merge` module to the `conflict` module that I introduced when I moved `Merge` to the `merge` module. I'm thinking the `conflict` module can focus on materialized conflicts.		2023-08-11 21:11:25 +00:00
..
commands	merge: move some methods back to conflicts as free functions	2023-08-11 21:11:25 +00:00
config	configs: add the ability to disable paging via ui.paginate	2023-08-11 12:45:53 -04:00
cleanup_guard.rs	cli: move src/ directory to new cli/ directory	2023-08-04 19:00:42 -05:00
cli_util.rs	Update docs and errors to use XDG config path	2023-08-11 13:21:44 -07:00
commit_templater.rs	cli: move src/ directory to new cli/ directory	2023-08-04 19:00:42 -05:00
config-schema.json	configs: add the ability to disable paging via ui.paginate	2023-08-11 12:45:53 -04:00
config.rs	Update docs and errors to use XDG config path	2023-08-11 13:21:44 -07:00
diff_util.rs	merge: move some methods back to conflicts as free functions	2023-08-11 21:11:25 +00:00
formatter.rs	cli: move src/ directory to new cli/ directory	2023-08-04 19:00:42 -05:00
graphlog.rs	cli: move src/ directory to new cli/ directory	2023-08-04 19:00:42 -05:00
lib.rs	cli: move src/ directory to new cli/ directory	2023-08-04 19:00:42 -05:00
main.rs	cli: move src/ directory to new cli/ directory	2023-08-04 19:00:42 -05:00
merge_tools.rs	merge: move some methods back to conflicts as free functions	2023-08-11 21:11:25 +00:00
operation_templater.rs	cli: move src/ directory to new cli/ directory	2023-08-04 19:00:42 -05:00
progress.rs	cli: move src/ directory to new cli/ directory	2023-08-04 19:00:42 -05:00
template.pest	cli: move src/ directory to new cli/ directory	2023-08-04 19:00:42 -05:00
template_builder.rs	cli: move src/ directory to new cli/ directory	2023-08-04 19:00:42 -05:00
template_parser.rs	cli: move src/ directory to new cli/ directory	2023-08-04 19:00:42 -05:00
templater.rs	cli: move src/ directory to new cli/ directory	2023-08-04 19:00:42 -05:00
text_util.rs	cli: move src/ directory to new cli/ directory	2023-08-04 19:00:42 -05:00
time_util.rs	cli: move src/ directory to new cli/ directory	2023-08-04 19:00:42 -05:00
ui.rs	configs: add the ability to disable paging via ui.paginate	2023-08-11 12:45:53 -04:00