diff --git a/git/.gitconfig b/git/.gitconfig index aa23bb7..54d2093 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -10,7 +10,7 @@ default = current [merge] tool = vimdiff -[includeIf "gitdir:~/workrepo"] +[includeIf "gitdir:~/workrepo/"] path = ~/.workgitconfig [branch] autoSetupMerge = always