Comment Comment by activitypea Sublime Merge was pretty alright, don't know if it's still around parent activitypea 4 years ago
