lib/puppet/util/diff.rb in puppet-3.0.1 vs lib/puppet/util/diff.rb in puppet-3.0.2.rc1

@@ -11,10 +11,10 @@
     command = [diff_cmd]
     if args = Puppet[:diff_args] and args != ""
       command << args
     end
     command << old << new
-    Puppet::Util::Execution.execute(command, :failonfail => false)
+    Puppet::Util::Execution.execute(command, :failonfail => false, :combine => false)
   end
 
   module_function :diff
 
   # return diff string of two input strings