Corrected display of ancestor lines in three-way merge.