User: bradfordcp Branch: HEAD Date: Tue, 02 Jun 2009 04:20:50 +0000 Added files: /modules/conflict_resolver conflict_resolver.admin.inc conflict_resolver.info conflict_resolver.module /modules/conflict_resolver/engines/system sys_diff.info sys_diff.module /modules/conflict_resolver/engines/xdiff xdiff.info xdiff.module Log message: Began work on pluggable back-end system for separate diff engines Links: http://cvs.drupal.org/diff.php?path=contributions/modules/conflict_resolver/... http://cvs.drupal.org/diff.php?path=contributions/modules/conflict_resolver/... http://cvs.drupal.org/diff.php?path=contributions/modules/conflict_resolver/... http://cvs.drupal.org/diff.php?path=contributions/modules/conflict_resolver/... http://cvs.drupal.org/diff.php?path=contributions/modules/conflict_resolver/... http://cvs.drupal.org/diff.php?path=contributions/modules/conflict_resolver/... http://cvs.drupal.org/diff.php?path=contributions/modules/conflict_resolver/...