switch to old display form new '3 - window'

[ASamSam]

Hello,
sorry, maybe already asked, but
but to switch to the classic merge design from the current new '3-window' display?
i have some habitation and still don`t feel comfortable with the new one...
Sincerely yours, Andrew

[sdottaka]

What exactly is the new '3-window' display?
It would be helpful if you could show me a screenshot if possible. If you simply don't want to display files and folders on 3pane, you can display them on 2pane, but that's not what you're talking about, right?

[ASamSam]

the 'merge' window seems became changed in case of conflict resolving:
before, it was basically left, right panes + result in the bottom

now there are three pane - columns, and seems logic is changed

[tetsuhaut]

Dear @ASamSam, the 'merge' window is opened by a command. It is that command that you need to change. have a look at the tool you use to resolve conflits. if this tool is git, the ~/.gitconfig file should contain the command I gave you.

[ASamSam]

Hello, little bit missed with @tetsuhaut answers. I do use winmerge in windows as a separate tool

[sdottaka]

@ASamSam

before, it was basically left, right panes + result in the bottom

WinMerge does not have the function to display the merge result at the bottom. The only tool I know of that does that is TortoiseMerge.
Weren't you using the tool in the image below?

https://tortoisesvn.net/assets/img/TMerge_ThreePane.88b06e39.png

If you are running WinMerge from TortoiseSVN or TortoiseGit, you can switch back to TortoiseMerge from the Diff viewer page in the Settings dialog.

https://tortoisesvn.net/docs/release/TortoiseSVN_en/images/SettingsProgs.png

[ASamSam]

Wow, I`m very sorry, seems to be I missed with my habitations. Thank you very much )