WIP Use diffconflicts as git merge tool
WIP Use diffconflicts as git merge tool

There's lots that is imperfect here, and it kind of barfs if there's
multiple files. However, it's a path forward and I can pick it up later
when I have some spare time.

bronzehedwick/dotfiles,bronzehedwick/dotfiles,bronzehedwick/dotfiles,bronzehedwick/dotfiles