replace fetch + merge with git pull

mikemallete · mikemallete · commit 4d8d545b8471 · 2013-05-23T16:42:56.000+08:00
diff --git a/lib/git/base.rb b/lib/git/base.rb
@@ -332,9 +332,8 @@ def each_conflict(&block) # :yields: file, your_version, their_version
     end
 
     # fetches a branch from a remote and merges it into the current working branch
-    def pull(remote = 'origin', branch = 'master', message = 'origin pull')
-      fetch(remote)
-      merge(branch, message)
+    def pull(remote = 'origin', branch = 'master')
+			self.lib.pull(remote, branch)
     end
     
     # returns an array of Git:Remote objects
