@@ -2,10 +2,9 @@ $:.unshift(File.dirname(__FILE__)) require 'rubygems' # Load the vendor gems -$:.unshift(File.dirname(__FILE__) + "/../vendor/gems") %w(trollop).each do |library| begin - require "#{library}/lib/#{library}" + require "#{library}" rescue puts "There was an error loading #{library}. Try running git submodule init && git submodule update to correct the problem" require 'trollop' lib/git-style-binary.rb vendor/gems/trollop 54688910e8a357b27e6b9519e2e507ab7f8f23d1 490899332418735629b0bf61046f4a7b0b5b0ac8 Nate Murray nate@natemurray.com http://github.com/jashmenn/git-style-binaries/commit/01311eccd7c1fceebda22048ba5281aa19f8af1a 01311eccd7c1fceebda22048ba5281aa19f8af1a 2009-06-22T17:26:14-07:00 2009-06-22T17:26:14-07:00 Merge branch 'auser/master' Conflicts: lib/git-style-binary.rb ecc626519b2793efc69dfafad456ac317752808a Nate Murray nate@natemurray.com