Nikita Galaiko 20782cec64 Merge pull request #1826 from gitbutlerapp/fix-conflict-markers ... test apply after update base		2023-11-29 10:21:23 +01:00
..
butler	replace cranky with new clippy	2023-11-24 09:03:04 +01:00
tauri	test apply after update base	2023-11-29 10:14:25 +01:00
ui	Improve UI for stashed branch header	2023-11-29 09:19:23 +00:00