revi/dots
1
0
Fork 0
Code Issues Wiki Activity

Use VScode for git merge conflict resolving

Browse source 
Per https://code.visualstudio.com/docs/editor/versioncontrol

Signed-off-by: Yongmin Hong <revi@pobox.com>
This commit is contained in:
revi 2018-10-02 17:06:05 +09:00
parent ad08237089
commit d810c98141
Signed by: revi
GPG key ID: AACAFCE3D8948D4E
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gitconfig.sample
View file

@ -8,3 +8,7 @@
editor = nano editor = nano
[include] [include]
path = /home/revi/dots/.gitaliases path = /home/revi/dots/.gitaliases
[diff]
tool = default-difftool
[difftool "default-difftool"]
cmd = code --wait --diff $LOCAL $REMOTE