![]() ![]() Now you may use vscode as your git difftool $ vi main.go $ git difftool diff -cc README.md index 54f96a6,b197bb6.0000000 - a/README.md +++ b/README.md -21,10 -21,9 +21,16 go get -u /kenichi-shibata/ku Usage - ``` ++ or from config file ~/.kube/kubectl/config +kubectl-switch download +kubectl-switch -k v.1.11.9 +# list available versions ++= + +# downloads v1.14.3 or -k or from config file ~/.kube/kubectl/config + +kubectl-switch downloadzs + +kubectl-switch -k v.1.11.9 ++> downloadz ls ~/.kube/kubectl/ ``` Config Viewing (1/1): 'main. Copy/paste the following and save the document as 'wMerge.sh' to your 'C:Program Files (x86)Gitbin' directory. Copy/paste the following and save the document as 'wMerge.sh' to your 'C:Program Files (x86)Gitbin' directory. PROGRA1 is the short DOS 8.3 folder name for the 'Program Files (x86)' folder where my winmerge is located. ![]() Add the below configuration to your gitconfig to start # Add this to you gitconfig # Comment: Start of "Extra Block" # Comment: This is to unlock VSCode as your git diff and git merge tool tool = vscode cmd = code -wait $MERGED tool = vscode cmd = code -wait -diff $LOCAL $REMOTE # VSCode Difftool # End of extra block Configure Winmerge in GIT Version Control Open a new doc in a text editor. ![]() If you are you can also use vscode as your difftool and your mergetool. By the way, does the C:WorkspaceImports folder exist If it does not exist, the report file is not created. It is not user-friendly not to output error messages or logs. Chances are you are using git as your source control. Unfortunately, there is no winmerge log file. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |