From 8185e202dfe6a70fb04d3eec7826e4ea54866c4a Mon Sep 17 00:00:00 2001
From: scott Chacon <schacon@agadorsparticus.corp.reactrix.com>
Date: Thu, 29 Nov 2007 11:16:14 -0800
Subject: applied a patch by mateusz jedruch <mateusz.jedruch@gmail.com> for
 iterating through merge conflicts

---
 tests/test_helper.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tests/test_helper.rb')

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
-- 
cgit