Mattias Granlund eeb99090ad Fix incorrect workspace_head during merge conflicts ... - without this we get an incorrect diff		2024-05-30 12:09:27 +02:00
..
src	Fix incorrect workspace_head during merge conflicts	2024-05-30 12:09:27 +02:00
tests	Fix incorrect workspace_head during merge conflicts	2024-05-30 12:09:27 +02:00
Cargo.toml	fix oplog-worktree merging	2024-05-29 17:58:54 +02:00