title: Use the default merge tool with git and Mac OS X
body: <p>I was changing the default merge tool of git, and an error occurred with my configuration, now my git doesn't work.
  Is possible come back to the default configuration?
  Thanks</p>