From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sascha Silbe Subject: custom merge driver vs. CONFLICT (delete/modify) Date: Sat, 25 Sep 2010 22:43:50 +0200 Message-ID: <1285445444-sup-3857@flatty.sascha.silbe.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg="pgp-sha1"; boundary="=-1285447431-520943-23460-8392-3-="; protocol="application/pgp-signature" Content-Transfer-Encoding: 8bit To: git X-From: git-owner@vger.kernel.org Sat Sep 25 22:50:47 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Ozbhk-0005DR-Aw for gcvg-git-2@lo.gmane.org; Sat, 25 Sep 2010 22:50:44 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756934Ab0IYUuh (ORCPT ); Sat, 25 Sep 2010 16:50:37 -0400 Received: from setoy.chost.de ([217.160.209.225]:45040 "EHLO smtp.chost.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756789Ab0IYUuf (ORCPT ); Sat, 25 Sep 2010 16:50:35 -0400 X-Greylist: delayed 401 seconds by postgrey-1.27 at vger.kernel.org; Sat, 25 Sep 2010 16:50:35 EDT Received: (qmail 32439 invoked by uid 5015); 25 Sep 2010 20:44:03 -0000 Received: (nullmailer pid 29141 invoked by uid 8193); Sat, 25 Sep 2010 20:43:51 -0000 Mail-followup-to: git User-Agent: Sup/git Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: --=-1285447431-520943-23460-8392-3-= Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: base64 SGkhCgpJIGFtIChhdXRvbWF0aWNhbGx5KSBidWlsZGluZyBzbmFwc2hvdCBw YWNrYWdlcyBieSBjb21iaW5pbmcgdGhlIHBhY2thZ2luZwptYWludGFpbmVk IGluIG9uZSByZXBvc2l0b3J5IChidXQgYWxzbyBjb250YWluaW5nIHNvdXJj ZXMpIHdpdGggKG1vcmUKcmVjZW50KSB1cHN0cmVhbSBzb3VyY2VzIGZyb20g YW5vdGhlciByZXBvc2l0b3J5LgoKRm9yIHNvbWUgZmlsZXMgKHRob3NlIHRv dWNoZWQgYnkgcmVydW5uaW5nIGF1dG8qKSBJIHdhbnQgdGhlIGxvY2FsCnZl cnNpb24gdG8gYWx3YXlzIHRha2UgcHJlY2VkZW5jZS4gRm9yIHNvbWUgb3Ro ZXIgZmlsZXMgKGF1dG9nZW4uc2gsIFBPCmZpbGVzKSBJIHdhbnQgdGhlIHVw c3RyZWFtIHZlcnNpb24gdG8gdGFrZSBwcmVjZWRlbmNlLiBGb3IgYWxsIHRo ZSByZXN0Ckkgd2FudCBjb25mbGljdHMgdG8gcHJvZHVjZSBhbiBlcnJvci4K ClRoaXMgaGFzIHdvcmtlZCBmaW5lIHNvIGZhciBieSB1c2luZyBjdXN0b20g bWVyZ2UgZHJpdmVycywgYnV0IHdoaWxlCmFkZGluZyB0aGUgc2Vjb25kIG9u ZSBJIGVuY291bnRlcmVkIGEgcHJvYmxlbTogTWVyZ2UgZHJpdmVycyBhcmUg b25seQppbnZva2VkIGZvciBtb2RpZnkvbW9kaWZ5IChhbmQgbWF5YmUgYWRk L2FkZCkgY29uZmxpY3RzLgpNb3JlIHNwZWNpZmljYWxseSBhIGRlbGV0ZS9t b2RpZnkgY29uZmxpY3Qgd2lsbCBjYXVzZSBnaXQtbWVyZ2UgdG8gYmFpbApv dXQgZGlyZWN0bHkgd2l0aG91dCBjYWxsaW5nIHRoZSBtZXJnZSBkcml2ZXIg dG8gcmVzb2x2ZSB0aGUgY29uZmxpY3QuClN1Y2ggYSBjb25mbGljdCBvY2N1 cnJlZCBiZWNhdXNlIHRoZSBwYWNrYWdpbmcgcGVvcGxlIHJlbW92ZWQgYXV0 b2dlbi5zaAood2hpY2ggaXMgcmVhc29uYWJsZSBmb3IgdGhlbSwgYnV0IG5v dCBmb3IgbWUpLgoKSXMgdGhlcmUgYSB3YXkgdG8gZWl0aGVyIHJlc29sdmUg YWxsIGtpbmRzIG9mIGNvbmZsaWN0cyBpbiBmYXZvdXIgb2YKb25lIHNpZGUg KGxpa2UgLVggPHNpZGU+KSBvciBhbHdheXMgdGFrZSBvbmUgc2lkZSAobGlr ZSAtcyA8c2lkZT4pIGZvcgphIHNwZWNpZmljIHNldCBvZiBmaWxlcz8KQWx0 ZXJuYXRpdmVseSwgaXMgdGhlcmUgYSB3YXkgdG8gZG8gYSBtZXJnZSBpbiBt dWx0aXBsZSAic3RlcHMiLApvcGVyYXRpbmcgb25seSBvbiBhIHN1YnNldCBv ZiB0aGUgZmlsZXMgZWFjaCB0aW1lIChzbyBJIGNhbiB1c2UKLXMgPHNpZGU+ IC8gLVggPHNpZGU+IGZvciB0d28gb2YgdGhyZWUgc3RlcHMgcGVyIG1lcmdl KT8KClNhc2NoYQoKLS0KaHR0cDovL3Nhc2NoYS5zaWxiZS5vcmcvCmh0dHA6 Ly93d3cuaW5mcmEtc2lsYmUuZGUvCg== --=-1285447431-520943-23460-8392-3-= Content-Disposition: attachment; filename="signature.asc" Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQEcBAEBCgAGBQJMnl8HAAoJELpz82VMF3DaX60H/iUCVNuLWvjpHcGGljXv6cVP zjvhTzL90k1dl4QbJ7QurdCSNuD52oXZ0couYxwEibS/ZQiXGjJpzcuR5YJR0nAe Rd0O7ObGxuKONq1yF6k3h6rMWrju0zxYzpM88QUszNADlZHI4xU4jmueA4RHmptL YK+k8JnXhxHSFZ5ObYCFPzTdfwO5SrDWgYzhcPqo+pVSno2e5Y0lXshTrOaS5lDF R22W9uw8hT1NfFpoaSo7CLnx6viU/7ebFk3iINgXbfWjDHzbcs1dOPiBp7+2q3ln /f3h7b2p/sVnexa7RJ90XtUi1xgP/17ALIYA8MmQQPn/LvMMEmxmMBDZoMgkLLo= =mCpz -----END PGP SIGNATURE----- --=-1285447431-520943-23460-8392-3-=--