From: Karl Hasselström <kha@treskal.com>
Date: Sun, 21 Sep 2008 12:17:40 +0000 (+0200)
Subject: Log conflicts separately for all commands
X-Git-Tag: v0.15-rc1~145
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/d6a698bbff11af2312600afb708d23d69e75d8e3?hp=d6a698bbff11af2312600afb708d23d69e75d8e3

Log conflicts separately for all commands

This takes care of the old-infrastructure commands as well. They'll
all be converted to the new infrastructure eventually, but until then
this patch is necessary to make all commands behave consistently.

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