Vimbiff: error-checking and 3- and 4-way diffs