1 files changed, 1 insertions, 0 deletions

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]