Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

I can't view layout #17

Open
jjhinojosa opened this issue Mar 4, 2022 · 0 comments
Open

I can't view layout #17

jjhinojosa opened this issue Mar 4, 2022 · 0 comments
Assignees
Labels
bug Something isn't working

Comments

@jjhinojosa
Copy link

jjhinojosa commented Mar 4, 2022

Steps to reproduce

  1. Install extension from Marketplace
  2. Execute "start Git mergetool"
  3. Open view merge, but not the layout 4-ways or 3-ways

Expected behavior

Open the file in 4-ways merge

[Optional] screenshots

image

Environment

  • Version of the extension: 0.14.0 - 2021-04-07
  • Operating system: VSCode in windows, git in linux
  • VS Code version [use Code command “Help: About”]: 1.63.2
  • Other installed extensions (if applicable):

Additional context

The configuration of .gitconfig is:
[init]
templatedir = /home/xxx/.git-templates
[difftool "vscode"]
cmd = code --wait --diff $LOCAL $REMOTE
[merge]
tool = vscode
conflictstyle = zdiff3 (I probe with diff3 also)
[mergetool "vscode"]
cmd = code --wait $MERGED
[diff]
tool = vscode
[mergetool]
keepTemporaries = false
keepBackup = false

When I try to change the layout I see this message:
This requires the diff layout to be active

@jjhinojosa jjhinojosa added the bug Something isn't working label Mar 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

No branches or pull requests

2 participants