From c408e814e0f96e12ba7bee2b0988d21706704aef Mon Sep 17 00:00:00 2001
From: Noah Masur <noah.masur@take2games.com>
Date: Sun, 29 Nov 2020 09:47:30 -0500
Subject: [PATCH] squelch git message about default pull conflicts

---
 git/gitconfig.symlink | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index 7d1350a..ec2847f 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -12,3 +12,5 @@
 	branch = false
 [core]
 	editor = nvim
+[pull]
+	ff = only