The 3-way merge does everything I need, but once the merge is complete it goes away. I simply want to repeat the 3-way on a single file after a completed merge, and perhaps make different choices.
I know TortoiseGitMerge can do it with a command line, after checking out and saving each of the parents, but that's a lot of extra work.
If this is not possible, is it a candidate for a future enhancement?
