git config --global core.editor "mate -w"
to change git editor
conflicts merged
Conflicts:
	eplusscripting/notes.txt
stuff