Martin von Zweigbergk 3b164c69a2 merge_tools: postpone writing conflict object a little longer ... This gets us a tiny bit closer to being able to write tree-level conflicts in this code.		2023-08-11 23:59:44 +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_tools: postpone writing conflict object a little longer	2023-08-11 23:59:44 +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