From: Karl Hasselström <kha@treskal.com>
Date: Sun, 27 Jan 2008 06:48:02 +0000 (+0100)
Subject: Don't clean away patches with conflicts
X-Git-Tag: v0.15-rc1~289
X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/commitdiff_plain/a639e7bbf3a6396254af76062ee88c22e4373340?hp=a639e7bbf3a6396254af76062ee88c22e4373340

Don't clean away patches with conflicts

If we have conflicts, it means that the topmost patch is empty because
of those conflicts (since StGit explicitly makes a conflicting patch
empty), so don't let "stg clean" touch it.

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