Robin
I am not sure that would be easy with some of the more “texty” approaches, but I am a fan of keyboard-driven processes
This precisely is why I have switched to meld, even when generally preferring the simplicity of purist text based approaches like anti-apXos’ method. In meld you can even do a folder comparison first, and then mark two of the highlighted files therein, open them in a new tab for detailed file comparison and merge, an once done go back to the first tab for continuing with the next highlighted file in the folders. This is some feature I won’t want to miss in complex merge operations. Meanwhile I have even set up git to use meld instead of diff for merging, which actually avoids the nasty code breaking git-merge-marker-insertations into files, instead the delta is simply highlighted.
Windows is like a submarine. Open a window and serious problems will start.