[contributions(DRUPAL-6--1):bradfordcp] /modules/conflict_resolver/engines/xdiff