[contributions:bradfordcp] /modules/conflict_resolver/engines/xdiff directory /modules/conflict_resolver/engines/xdiff - New