From: David Kågedal <david@virtutech.com>
Date: Wed, 19 Dec 2007 18:00:12 +0000 (+0000)
Subject: Simplify merge_recursive
X-Git-Tag: v0.15-rc1~338
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/350bcba5aeae79c9e8e6619d2b00ec1804c1390f?hp=350bcba5aeae79c9e8e6619d2b00ec1804c1390f

Simplify merge_recursive

Listing the unmerged files is unnecessary, since the information
isn't really used anyway. Just note if the merge failed or succeeded.

Signed-off-by: David Kågedal <davidk@lysator.liu.se>
Signed-off-by: Karl Hasselström <kha@treskal.com>
---