From d810c98141a0afb28b51cc849af02661663571a2 Mon Sep 17 00:00:00 2001
From: Yongmin Hong <revi@pobox.com>
Date: Tue, 2 Oct 2018 17:06:05 +0900
Subject: [PATCH] Use VScode for git merge conflict resolving

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

Signed-off-by: Yongmin Hong <revi@pobox.com>
---
 gitconfig.sample | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gitconfig.sample b/gitconfig.sample
index 5a589c1..c37e35d 100644
--- a/gitconfig.sample
+++ b/gitconfig.sample
@@ -8,3 +8,7 @@
 	editor = nano
 [include]
 	path = /home/revi/dots/.gitaliases
+[diff]
+        tool = default-difftool
+[difftool "default-difftool"]
+        cmd = code --wait --diff $LOCAL $REMOTE