News for hackers. Stuff that matters.
Re:GitKraken: git GUI Client for Windows Mac and Linux by Vlaix on Wednesday March 02, 2016 @07:07AM (#11209428)
To be completely honest, I also do it like this at the moment, using Kdiff as a merge tool. I've been thinking about moving over to Ediff, but I'm lazy.

There are no comments on this comment yet.