From: Karl Hasselström <kha@treskal.com>
Date: Wed, 19 Dec 2007 18:00:13 +0000 (+0000)
Subject: Fix "stg resolved" to work with new conflict representation
X-Git-Tag: v0.15-rc1~333
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/c5bd76328bafd7cd95f826342c0741c2ad64a545?hp=c5bd76328bafd7cd95f826342c0741c2ad64a545

Fix "stg resolved" to work with new conflict representation

The actual resolving is done by calling the same subroutine as "git
add".

Instead of using existing *.{ancestor,current,patches} files, the
interactive merge has to create them from the index contents, and
delete them afterwards.

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