ParentFull threadO_H_E·Not really unorthodox, but I have been really liking SublimeMerge on linux. I know MacOS is Win have a few nice GUI clients but non support linux.https://www.sublimemerge.com/View on HN