forked from mirrors/jj
82883e648d
Before we had `conflicts::Conflict`, most of these functions took a `backend::Conflict`. I think I didn't want to pollute the `backend` module with this kind of logic, trying to keep it focused on storage. Now that we have the type in `conflicts`, however, I think it makes sense to move these functions onto it. |
||
|---|---|---|
| .. | ||
| commands | ||
| config | ||
| cleanup_guard.rs | ||
| cli_util.rs | ||
| commit_templater.rs | ||
| config-schema.json | ||
| config.rs | ||
| diff_util.rs | ||
| formatter.rs | ||
| graphlog.rs | ||
| lib.rs | ||
| main.rs | ||
| merge_tools.rs | ||
| operation_templater.rs | ||
| progress.rs | ||
| template.pest | ||
| template_builder.rs | ||
| template_parser.rs | ||
| templater.rs | ||
| text_util.rs | ||
| time_util.rs | ||
| ui.rs | ||