1 files changed, 8 insertions, 1 deletions
diff --git a/lib/git/base.rb b/lib/git/base.rb
index e9ffc61..c5fac45 100644
--- a/lib/git/base.rb
+++ b/lib/git/base.rb
@@ -299,6 +299,13 @@ module Git
       self.lib.merge(branch, message)
     end
 
+    # iterates over the files which are unmerged
+    #
+    # yields file, your_version, their_version
+    def each_conflict(&block)
+      self.lib.conflicts(&block)
+    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)
@@ -445,4 +452,4 @@ module Git
     
   end
   
-end
-\ No newline at end of file
+end