Integrates three-way text diff into conflict detection
Adds additional test: change-delete single line
Fixes issue regarding diff.getValue (is not always correct)