Merge branch 'master' of github.com:drush-ops/drush

Author: greg-1-anderson

commands/core/config.drush.inc

@@ -22,8 +22,6 @@ function config_drush_help($section) {
       return dt('Config commands');
     case 'meta:config:summary':
       return dt('Interact with the configuration system.');
-    case 'drush:config-merge':
-      return dt('Combine configuration data from this site with the configuration data of another site; if there are conflicts, open an interactive three-way merge tool comparing the changes with the base revision');
   }
 }
 

tests/Unish/UnishTestCase.php

@@ -109,7 +109,10 @@ public static function get_tar_executable() {
   function tick() {
     static $chars = array('/', '-', '\\', '|');
     static $counter = 0;
-    print $chars[($counter++ % 4)] . "\033[1D";
+    // ANSI support is flaky on Win32, so don't try to do ticks there.
+    if (!$this->is_windows()) {
+      print $chars[($counter++ % 4)] . "\033[1D";
+    }
   }
 
   /**