diff --git a/.gitconfig b/.gitconfig index bd7a80b..73f493f 100644 --- a/.gitconfig +++ b/.gitconfig @@ -11,4 +11,6 @@ [help] autocorrect = 20 # https://opensource.com/article/20/11/git-aliases [merge] - conflictStyle = diff3 + conflictStyle = diff3 +[safe] + directory = /home/mg/dotfiles