Three-way git merge display thing
Open new files in emacs from command line in existing frame