GitHub Desktop
Unfortunately, GitHub Desktop does not currently support external diff or merge tools. We recommend using Kaleidoscope with any of these Git clients:
Unfortunately, GitHub Desktop does not currently support external diff or merge tools. We recommend using Kaleidoscope with any of these Git clients: