[contributions:bradfordcp] /modules/conflict_resolver conflict_resolver.module /modules/conflict_resolver/engines/xdiff xdiff.module

User: bradfordcp Branch: HEAD Date: Sat, 01 Aug 2009 15:56:01 +0000 Modified files: /modules/conflict_resolver conflict_resolver.module /modules/conflict_resolver/engines/xdiff xdiff.module Log message: Almost finished automatic resolution (CCK needs to be double checked), UI for manual resolution is coming together. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/conflict_resolver/... http://cvs.drupal.org/diff.php?path=contributions/modules/conflict_resolver/...