From: Karl Hasselström <kha@treskal.com>
Date: Wed, 19 Dec 2007 18:00:12 +0000 (+0000)
Subject: Nicer conflict markers
X-Git-Tag: v0.15-rc1~336
X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/commitdiff_plain/78d1c847f77f3ed482574d75b682f1408cdf2002?ds=sidebyside

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 659bd7b..43ac204 100644
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -710,7 +710,10 @@ def merge_recursive(base, head1, head2):
     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