From 10ccdf06fe817084b8a5d86f51770a5fdc5f6341 Mon Sep 17 00:00:00 2001
From: Yigit Sever
Date: Wed, 16 Sep 2020 14:44:55 +0300
Subject: use vim conflicted for git

---
 .gitconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitconfig b/.gitconfig
index 0656c9d..d281344 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -16,6 +16,7 @@
     type = cat-file -t
     dump = cat-file -p
     adog = log --all --decorate --oneline --graph
+	conflicted = !nvim +Conflicted
 [credential]
     helper = cache --timeout=3600
 [color]
-- 
cgit v1.2.3-70-g09d2