Contents

require File.dirname(__FILE__) + '/helper'
require 'pp'

class TestMerge < Test::Unit::TestCase

  def setup
    @r = Repo.new(File.join(File.dirname(__FILE__), *%w[dot_git]), :is_bare => true)
    @merge = fixture('merge_result')
  end
  
  def test_from_string
    m = Grit::Merge.new(@merge)
    assert_equal m.sections, 3
    assert_equal m.conflicts, 1
  end

end

Version data entries

11 entries across 11 versions & 5 rubygems

Version	Path
boof-grit-1.1.2	test/test_merge.rb
davetron5000-grit-1.1.2	test/test_merge.rb
davetron5000-grit-1.1.3	test/test_merge.rb
joelmoss-grit-1.1.4	test/test_merge.rb
joelmoss-grit-1.1.5	test/test_merge.rb
joelmoss-grit-1.1.6	test/test_merge.rb
square-circle-triangle-grit-1.1.3	test/test_merge.rb
square-circle-triangle-grit-1.1.4	test/test_merge.rb
grit-1.0.0	test/test_merge.rb
grit-1.1.0	test/test_merge.rb
grit-1.0.1	test/test_merge.rb