From 646304a6e7c3b2c442a0a7db995629e7009c3a14 Mon Sep 17 00:00:00 2001
From: scott Chacon <schacon@agadorsparticus.(none)>
Date: Sun, 11 Nov 2007 17:59:18 -0800
Subject: added documentation and a license file

---
 lib/git/branch.rb | 4 ++++
 lib/git/lib.rb    | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/git/branch.rb b/lib/git/branch.rb
index 4b4ecfc..7cef94e 100644
--- a/lib/git/branch.rb
+++ b/lib/git/branch.rb
@@ -72,6 +72,10 @@ module Git
       end
     end
     
+    def to_a
+      [@full]
+    end
+    
     def to_s
       @full
     end
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
index 3f97929..5bb2e2b 100644
--- a/lib/git/lib.rb
+++ b/lib/git/lib.rb
@@ -257,7 +257,7 @@ module Git
       command('checkout', arr_opts)
     end
     
-    def merge(branch, message = nil)
+    def merge(branch, message = nil)      
       arr_opts = []
       arr_opts << ["-m '#{message}'"] if message
       arr_opts << branch.to_a.join(' ')
@@ -330,7 +330,7 @@ module Git
           if $?.exitstatus == 1 && out == ''
             return ''
           end
-          raise Git::GitExecuteError.new(git_cmd + out.to_s)
+          raise Git::GitExecuteError.new(git_cmd + ':' + out.to_s)
         end
         out
       end
-- 
cgit