Properly escaping diff output for CLI conflict resolver.

rhomobile · Nov 17, 2008 · aa49cba · aa49cba
1 parent b5914c0
commit aa49cba
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/templater/cli/generator.rb b/lib/templater/cli/generator.rb
@@ -163,9 +163,9 @@ def say_status(status, template, color = nil)
       def output_diff_line(diff)
         case diff.action
         when '-'
-          say "<%= color('-  #{diff.element.chomp}', :red) %>"
+          say "<%= color( %(-  #{diff.element.chomp}), :red) %>"
         when '+'
-          say "<%= color('+  #{diff.element.chomp}', :green) %>"
+          say "<%= color( %(+  #{diff.element.chomp}), :green) %>"
         else
           say "#{diff.action}  #{diff.element.chomp}"
         end