Merge branch 'main' into add-setup

# Conflicts: # scripts/setup.sh
greenchapter · greenchapter · Mar 18, 2019 · Jun 6, 2019 · Jun 7, 2019 · Jun 7, 2019
commit c9da4a22468e3f8d487131dc8157355398e4acc1
diff --git a/scripts/setup.sh b/scripts/setup.sh
@@ -6,6 +6,9 @@
 # Based on Gerald baeck Bootstrap Script
 # - https://github.com/geraldbaeck/dotfiles/blob/master/osx_scripts/osx_bootstrap.sh
 
+# git config --global --add difftool.prompt false
+# git config --global diff.tool opendiff
+
 echo "\n\n     Start bootstrapping your new mac.\n"
 echo -n "       .----.\n"
 echo -n "       |\033[1m>_\033[0m  |\n"