Use git difftool for merge.tool identifiers#900

rafaelfranca merged 1 commit intorails:mainrails/thor:mainfrom

moguls753:mainmoguls753/thor:mainCopy head branch name to clipboard