You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Which problem is your feature request related to, if any?
Layouts
Solution you'd like
An extra layout option, if possible; similar to 3DiffTo* flavors, but only show diff in one pane ("Merged"), and base changes in other ("Local", "Remote").
Perhaps named 3LocalMergedRemote?
From looking at code, I think it'd be something like changing this to use type: LayoutElementType.normalEditor?
eacousineau
changed the title
Provide 3-pane layout where "Local" and "Remote" are shown w/o edits?
Provide 3-pane layout where "Local" and "Remote" are shown w/o diffs?
Nov 24, 2021
Which problem is your feature request related to, if any?
Layouts
Solution you'd like
An extra layout option, if possible; similar to
3DiffTo*
flavors, but only show diff in one pane ("Merged"), and base changes in other ("Local", "Remote").Perhaps named
3LocalMergedRemote
?From looking at code, I think it'd be something like changing this to use
type: LayoutElementType.normalEditor
?vscode-as-git-mergetool/src/layouters/threeDiffToBaseLayouter.ts
Lines 43 to 52 in de60bc0
Description of alternatives you've considered
I've briefly tried out existing
3DiffTo*
layouts, but get confused when all panes show diffs.Additional context
I believe this is similar to how Meld works.
The text was updated successfully, but these errors were encountered: