Permalink
Browse files

merge

  • Loading branch information...
1 parent 1a0c339 commit 130771717ebb4d360c9b72c9cc548f7c4d1bd5b5 @hcatlin hcatlin committed Dec 28, 2011
Showing with 3 additions and 5 deletions.
  1. +2 −0 Gemfile.lock
  2. +0 −4 lib/mini_magick.rb
  3. +1 −1 test/image_test.rb
View
@@ -9,6 +9,7 @@ GEM
specs:
rake (0.9.2)
subexec (0.2.1)
+ test-unit (2.4.3)
PLATFORMS
java
@@ -17,3 +18,4 @@ PLATFORMS
DEPENDENCIES
mini_magick!
rake
+ test-unit
View
@@ -354,11 +354,7 @@ def method_missing(symbol, *args)
#
# @yieldparam command [CommandBuilder]
def combine_options(tool = :mogrify, &block)
-<<<<<<< HEAD
c = CommandBuilder.new(tool)
-=======
- c = CommandBuilder.new(tool || :mogrify)
->>>>>>> 2d1cdee6168cd92e6540d051cc1c46f33580a76f
c << @path if tool == :convert
block.call(c)
View
@@ -231,7 +231,7 @@ def test_simple_composite
result = image.composite(Image.open(TIFF_IMAGE_PATH)) do |c|
c.gravity "center"
end
- assert `diff -s #{result.path} test/composited.jpg`.include?("identical")
+ assert `diff -s #{result.path} test/files/composited.jpg`.include?("identical")
else
puts "Need at least version #{MiniMagick.minimum_image_magick_version} of ImageMagick"
end

0 comments on commit 1307717

Please sign in to comment.