spacemacs: Make update script start merge tool for dotfile template changes
spacemacs: Make update script start merge tool for dotfile template changes

razzolini/dotfiles,razzolini/dotfiles,razzolini/dotfiles