Print conflict details with the new infrastructure (bug #11181)

[stgit] / stgit / git.py

diff --git a/stgit/git.py b/stgit/git.py
index ee31ecd..4d01fc2 100644 (file)
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -669,10 +669,6 @@ def diff(files = None, rev1 = 'HEAD', rev2 = None, diff_flags = [],
     else:
         return ''
 
-def diffstat(diff):
-    """Return the diffstat of the supplied diff."""
-    return GRun('apply', '--stat', '--summary').raw_input(diff).raw_output()
-
 def files(rev1, rev2, diff_flags = []):
     """Return the files modified between rev1 and rev2
     """