add GIT_MERGE_AUTOEDIT=no
Merge branch 'master' of github.com:10sr/dotfiles

Conflicts:
	bashrc