summaryrefslogtreecommitdiffstats
path: root/tests/test_helper.rb
diff options
context:
space:
mode:
authorscott Chacon <schacon@agadorsparticus.corp.reactrix.com>2007-11-29 11:16:14 -0800
committerscott Chacon <schacon@agadorsparticus.corp.reactrix.com>2007-11-29 11:16:14 -0800
commit8185e202dfe6a70fb04d3eec7826e4ea54866c4a (patch)
tree908539c1092cf3231b58d1b4d60c4b11b1d1e649 /tests/test_helper.rb
parentc6db2b7c34eb98a38047fca8fbef4a39279eaf08 (diff)
downloadthird_party-ruby-git-8185e202dfe6a70fb04d3eec7826e4ea54866c4a.tar.gz
third_party-ruby-git-8185e202dfe6a70fb04d3eec7826e4ea54866c4a.tar.xz
third_party-ruby-git-8185e202dfe6a70fb04d3eec7826e4ea54866c4a.zip
applied a patch by mateusz jedruch <mateusz.jedruch@gmail.com> for iterating through merge conflicts
Diffstat (limited to 'tests/test_helper.rb')
-rw-r--r--tests/test_helper.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/test_helper.rb b/tests/test_helper.rb
index e40174a..1ee8dbf 100644
--- a/tests/test_helper.rb
+++ b/tests/test_helper.rb
@@ -1,5 +1,6 @@
require 'test/unit'
require 'fileutils'
+require 'logger'
require File.dirname(__FILE__) + '/../lib/git'
class Test::Unit::TestCase