added generic difftool for Git working across OS X and Linux