Add sublime as editor, and FileMerge as mergetool (for git).