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

9 entries across 9 versions & 3 rubygems

Version	Path
madrox-0.2.0	vendor/grit/test/test_merge.rb
madrox-0.1.1	vendor/grit/test/test_merge.rb
madrox-0.1.0	vendor/grit/test/test_merge.rb
ginst-2009.12.8	vendor/plugins/grit/test/test_merge.rb
ginst-2009.11.24	vendor/plugins/grit/test/test_merge.rb
ginst-2009.11.23	vendor/plugins/grit/test/test_merge.rb
ginst-2.0.1	vendor/plugins/grit/test/test_merge.rb
ginst-2.0.0	vendor/plugins/grit/test/test_merge.rb
grit-2.0.0	test/test_merge.rb