diff --git a/.gitconfig b/.gitconfig index fab48861..72ed6970 100644 --- a/.gitconfig +++ b/.gitconfig @@ -14,8 +14,8 @@ m = mergetool r = remote -v s = status -uno -# [push] -# default = simple +[push] + default = current ## Ediff merge tool. ## See: