default config for merge tool

Benjamin Mako Hill || Want to submit a patch?