Ilya Grigoriev 887e5665d5 commands: move resolve code to resolve.rs ... The print_conflicted_paths function could belong either to `resolve.rs` or `status.rs`; I put it into the former for now. Cc #2465, #2457		2023-10-29 18:19:06 -07:00
..
examples	backend: make read_conflict synchronous again	2023-10-28 16:45:40 -07:00
src	commands: move resolve code to resolve.rs	2023-10-29 18:19:06 -07:00
testing	fake_diff_editor: Allow specifying extra arguments to be ignored	2023-08-21 20:19:15 -07:00
tests	templater: add local/remote_branches keywords	2023-10-28 11:03:23 +09:00
build.rs	build: update rerun-if conditions to watch .git/HEAD in colocated repo	2023-08-06 12:16:11 +09:00
Cargo.toml	cli: use StringPattern to find branches to delete/forget	2023-10-22 04:07:49 +09:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00