Nicer conflict markers

Instead of tagging the conflict markers with sha1 hashes, use
"ancestor", "current", and "patched".

Signed-off-by: Karl Hasselström <kha@treskal.com>

diff --git a/stgit/git.py b/stgit/git.py
index 659bd7b152154136fbfaae1a28db314723f557c9..43ac204374dd7f85f380fd99c54c088e2b5fc660 100644 (file)
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -710,7 +710,10 @@ def merge_recursive(base, head1, head2):
     local tree
     """
     refresh_index()
     local tree
     """
     refresh_index()

-    p = GRun('merge-recursive', base, '--', head1, head2).returns([0, 1])
+    p = GRun('merge-recursive', base, '--', head1, head2).env(
+        { 'GITHEAD_%s' % base: 'ancestor',
+          'GITHEAD_%s' % head1: 'current',
+          'GITHEAD_%s' % head2: 'patched'}).returns([0, 1])

     output = p.output_lines()
     if p.exitcode == 0:
         # No problems
     output = p.output_lines()
     if p.exitcode == 0:
         # No problems