Alex@LibertyPaulM A lot of the features seem to exist in Kdiff3 and I've been using Kdiff3 as git conflict resolution tool since forever.
I wish Kdiff3 would have integration on par with what sublime merge has to offer.
Jonkman Microblog is a social network, courtesy of SOBAC Microcomputer Services. It runs on GNU social, version 1.2.0-beta5, available under the GNU Affero General Public License.
All Jonkman Microblog content and data are available under the Creative Commons Attribution 3.0 license.