'commit'
commit
Merge remote-tracking branch 'origin/windows'

Conflicts:
	Installed Packages/Git.sublime-package