Permalink
Browse files

Merge branch 'knowtheory_master'

* knowtheory_master:
  Properly escaping diff output for CLI conflict resolver.
  • Loading branch information...
2 parents 4e4d6e3 + aa49cba commit d386694add93d195ce5d1ce2570d35ee1eb00db7 @michaelklishin michaelklishin committed Nov 18, 2008
Showing with 2 additions and 2 deletions.
  1. +2 −2 lib/templater/cli/generator.rb
View
4 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

0 comments on commit d386694

Please sign in to comment.