[meld] vc.git: Add 'resolve' support for git, which is just git add...

[Kai Willadsen <kaiw src gnome org>]

commit 1d6714ea07c74ee806adb517c36048ae3bbdd944
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Tue Apr 22 07:35:37 2014 +1000

    vc.git: Add 'resolve' support for git, which is just git add...

 meld/vc/git.py |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/meld/vc/git.py b/meld/vc/git.py
index adb250e..209ab65 100644
--- a/meld/vc/git.py
+++ b/meld/vc/git.py
@@ -205,6 +205,10 @@ class Vc(_vc.CachedVc):
             command = [self.CMD, 'checkout', 'HEAD']
             runner(command, missing, refresh=True, working_dir=self.root)
 
+    def resolve(self, runner, files):
+        command = [self.CMD, 'add']
+        runner(command, files, refresh=True, working_dir=self.root)
+
     def get_path_for_conflict(self, path, conflict):
         if not path.startswith(self.root + os.path.sep):
             raise _vc.InvalidVCPath(self, path, "Path not in repository")