AptDiff

Visual files comparison and merging utility