From: David Kågedal <david@virtutech.com>
Date: Wed, 19 Dec 2007 18:00:11 +0000 (+0000)
Subject: Leave working dir and index alone after failed (conflicting) push
X-Git-Tag: v0.15-rc1~340
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/f02be96172f8cf36e052ff86678646b1991ed283?hp=f02be96172f8cf36e052ff86678646b1991ed283

Leave working dir and index alone after failed (conflicting) push

This leaves the index and working tree in the state that merge-recursive
left it, with unmerged files in different stages, and the non-conflicting
changes in the index.

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