Comment 9 for bug 653031

Thanks for confirming, I'll mark it as a dupe.

The root issue here is that --take-this and --take-other are *not* implemented (yet) for text conflicts but the implementation inherits from another kind of conflict which is totally irrelevant :(

I'm working on a fix.