From 78d1c847f77f3ed482574d75b682f1408cdf2002 Mon Sep 17 00:00:00 2001
Message-Id: <78d1c847f77f3ed482574d75b682f1408cdf2002.1746783023.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Wed, 19 Dec 2007 18:00:12 +0000
Subject: [PATCH] Nicer conflict markers
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
Organization: Straylight/Edgeware

From: Karl Hasselström <kha@treskal.com>

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

Signed-off-by: Karl Hasselström <kha@treskal.com>
---
 stgit/git.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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
-- 
[mdw]