Martin von Zweigbergk 662297acc3 tests: add test for delete/modify branch-conflict case (#32) ... There was a TODO about adding a test case for a delete/modify conflict in a branch target that got resolved by abandoning a commit. The resolution is to delete the branch. That case couldn't happend with our old evolution-based mechanism for tracking rewrites (because we couldn't un-prune a commit then).		2022-03-27 21:11:55 -07:00
..
protos	working_copy: stop keeping track of commit ID	2022-02-12 17:22:37 -08:00
src	cli: display how many commits were rebased when merging operations (#111)	2022-03-26 22:31:49 -07:00
tests	tests: add test for delete/modify branch-conflict case (#32)	2022-03-27 21:11:55 -07:00
build.rs	build: conditionally use map_first_last feature if available	2022-02-20 22:21:14 -08:00
Cargo.toml	config: move reading of config from lib crate to CLI crate	2022-03-23 09:57:42 -07:00