Use VScode for git merge conflict resolving
Use VScode for git merge conflict resolving

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

Signed-off-by: Yongmin Hong <50c14c03e808d297b970654149350b614583aa5d@pobox.com>

revi/dots