.orig file contains conflict markers after merge "take other"
Created originally on Bitbucket by Anonymous
When performing a merge with option "automatically resolve merge conflicts where possible" activated and there are conflicts that have to be resolved manually and then action "take other" is taken, the generated .orig files are not copies of the original file, but contain conflict markers like "<<<<<<< local" and ">>>>>>> other" as well as code from the other branch.
Others also stumbled over this behaviour, see https://sourceforge.net/p/tortoisehg/mailman/message/32845534/
Some may call this behaviour a feature, but from my point of view it is a bug, because a file named .orig should be the original file and not some merge attempt. It would be better to generate an addtional file, for example named .merge, containing the merge attempt.