User: bradfordcp Branch: HEAD Date: Mon, 08 Jun 2009 22:39:11 +0000 Modified files: /modules/conflict_resolver/engines/system sys_diff.module Log message: Updates to the system engine to generate a merged output similar to that of xdiff. Conflicts are NOT being recorded currently. The majority of development here has been the ed processing engine and determining the optimal command line flags and arguments for diff3 Links: http://cvs.drupal.org/diff.php?path=contributions/modules/conflict_resolver/...