applied a patch by mateusz jedruch <mateusz.jedruch@gmail.com> for iterating through... master
authorscott Chacon <schacon@agadorsparticus.corp.reactrix.com>
Thu, 29 Nov 2007 19:16:14 +0000 (11:16 -0800)
committerscott Chacon <schacon@agadorsparticus.corp.reactrix.com>
Thu, 29 Nov 2007 19:16:14 +0000 (11:16 -0800)
commit8185e202dfe6a70fb04d3eec7826e4ea54866c4a
tree908539c1092cf3231b58d1b4d60c4b11b1d1e649
parentc6db2b7c34eb98a38047fca8fbef4a39279eaf08
applied a patch by mateusz jedruch <mateusz.jedruch@gmail.com> for iterating through merge conflicts
lib/git/base.rb
lib/git/lib.rb
tests/test_helper.rb