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://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/78d1c847f77f3ed482574d75b682f1408cdf2002?ds=inline;hp=78d1c847f77f3ed482574d75b682f1408cdf2002

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>
---