Sublime Mergesublimemerge.comGet Sublime MergeA cross-platform Git client, done the Sublime Text wayDevelopment & Programming