From: Nicolas Pitre Date: Mon, 26 Sep 2011 23:06:06 GMT Subject: rerere with modified/deleted conflicts Message-ID: Is this supported already? Nicolas