ParentFull threadjdance·What about Sublime Merge? I think its great, and works great for me on LinuxView on HN