Swapped Theirs and Mine in Edit conflicts outside of rebase dialog on rebasing
What steps will reproduce the problem?
See attached file with repository and two cloned directories
worktree_pull - do Sync-Pull. There will be conflicts. Edit conflict. Theirs and Mine are correct.
worktree_pull_autorebase - master branch has rebase = true in .git/config. Do Sync-Pull. There will be conflicts. Edit conflict. Theirs and Mine are swapped. Mine is theirs and Theirs is mine.
I don't know if this is a bug in TortoiseGit or in git itself.
What version of TortoiseGit and Git are you using? On what operating system?
Please provide any additional information below.