From: Uwe Kleine-König Date: Mon, 01 Dec 2008 14:36:40 GMT Subject: Re: [TOPGIT] Resolving conflicts Message-ID: <20081201143640.GA17818@cassiopeia.tralala> In-Reply-To: <20081201121819.GB13495@pengutronix.de> [added martin f krafft to Cc:] Hi, > Another thing is that the exported branch contains an empty commit > resulting from t/whatever (and a corresponding empty patch when exported > as a quilt series) I fixed one half of this in with a patch sent to the ML: http://article.gmane.org/gmane.comp.version-control.git/101728 it didn't made it upstream yet, though. Best regards Uwe