3 ms·Intellij diff helps me keep my sanity when I merge with conflictsby boruto 4y agoIntellij diff helps me keep my sanity when I merge with conflicts