We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
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
Open the file in 4-ways merge
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
The text was updated successfully, but these errors were encountered:
zawys
No branches or pull requests
Steps to reproduce
Expected behavior
Open the file in 4-ways merge
[Optional] screenshots
Environment
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
The text was updated successfully, but these errors were encountered: