diff options
author | Luke Kanies <luke@madstop.com> | 2008-03-25 18:18:34 -0500 |
---|---|---|
committer | Luke Kanies <luke@madstop.com> | 2008-03-25 18:18:34 -0500 |
commit | a8592f1009040ebf30a98268610915cc33bb3f63 (patch) | |
tree | 49f61323a8536d58ce332e97b882677f55727df7 /lib/puppet/util/diff.rb | |
parent | e1907798425a7b163ac1b831b0cf11e88985815e (diff) | |
parent | 491a69682728818e04b8a20a5d8f4f783ad6ddaf (diff) | |
download | puppet-a8592f1009040ebf30a98268610915cc33bb3f63.tar.gz puppet-a8592f1009040ebf30a98268610915cc33bb3f63.tar.xz puppet-a8592f1009040ebf30a98268610915cc33bb3f63.zip |
Merge branch '0.24.x'
Conflicts:
install.rb
lib/puppet/defaults.rb
man/man8/puppet.8
Diffstat (limited to 'lib/puppet/util/diff.rb')
-rw-r--r-- | lib/puppet/util/diff.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/util/diff.rb b/lib/puppet/util/diff.rb index e6ff57108..f37ea0850 100644 --- a/lib/puppet/util/diff.rb +++ b/lib/puppet/util/diff.rb @@ -27,7 +27,7 @@ module Puppet::Util::Diff output = "" - diffs = Diff::LCS.diff(data_old, data_new) + diffs = ::Diff::LCS.diff(data_old, data_new) return output if diffs.empty? oldhunk = hunk = nil @@ -35,7 +35,7 @@ module Puppet::Util::Diff diffs.each do |piece| begin - hunk = Diff::LCS::Hunk.new(data_old, data_new, piece, + hunk = ::Diff::LCS::Hunk.new(data_old, data_new, piece, context_lines, file_length_difference) file_length_difference = hunk.file_length_difference |