@jacques@mastodon.chester.id.au @Schneems@ruby.social We use Sublime Merge...it's decent, though I have not tried others so I have no basis for comparison.