tcitta

Use VSCode diff view for resolving merge conflicts

4

It would be nice if the vscode diff view could be used to resolve conflicts. Setting P4EDITOR='code --wait' just opens a new text document with markers and no colorization. Perhaps...