Tags: #software # BeyondCompare The absolute best comparison tool I’ve come across. - For merge conflicts, the 4-way view with base, local, remote, and merged is the best way to understand the changes. - It does an amazing job at displaying delta information and determining which lines were added and removed.