Caleb Owens ca0ece9d49 Use the auto-resolution if the head is conflicted		2024-08-26 15:05:36 +02:00
..
src	Use the auto-resolution if the head is conflicted	2024-08-26 15:05:36 +02:00
tests	Yes Kiril, I know its an abrv., but its consistent with what Byron started	2024-07-29 10:46:17 +02:00
Cargo.toml	Merge pull request #4717 from gitbutlerapp/Rebase-revolution	2024-08-22 18:28:49 +02:00