Include foldcolumn in diff width calculation
Account for third window width in merge diff