From: David Kågedal <david@virtutech.com>
Date: Wed, 19 Dec 2007 18:00:11 +0000 (+0000)
Subject: Added a test case to check what happens when push finds a conflict
X-Git-Tag: v0.15-rc1~339
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/59c97ab4255eb651bc9bcc05c62bc45df3840e20?hp=59c97ab4255eb651bc9bcc05c62bc45df3840e20

Added a test case to check what happens when push finds a conflict

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