ParentFull threadshandor·p4merge is indeed awesome. I work exclusively in Linux environments, but p4merge always gets installed. The experience has actually gotten better in that regard since git started supporting it straight as one of its 'mergetools'.View on HN