From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Dan Hensgen" Subject: 0001-Detailed-tools-useful-when-resolving-merge-conflicts.patch Date: Wed, 20 Aug 2008 23:27:32 -0400 Message-ID: <8f6a00e30808202027s1d481a01q22c5a7444cd03f80@mail.gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_35953_11425781.1219289252249" To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Aug 21 05:29:00 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1KW0qy-0001wc-50 for gcvg-git-2@gmane.org; Thu, 21 Aug 2008 05:28:52 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759335AbYHUD1f (ORCPT ); Wed, 20 Aug 2008 23:27:35 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758818AbYHUD1e (ORCPT ); Wed, 20 Aug 2008 23:27:34 -0400 Received: from wa-out-1112.google.com ([209.85.146.177]:15527 "EHLO wa-out-1112.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758578AbYHUD1c (ORCPT ); Wed, 20 Aug 2008 23:27:32 -0400 Received: by wa-out-1112.google.com with SMTP id j37so190267waf.23 for ; Wed, 20 Aug 2008 20:27:32 -0700 (PDT) Received: by 10.115.22.1 with SMTP id z1mr979266wai.99.1219289252249; Wed, 20 Aug 2008 20:27:32 -0700 (PDT) Received: by 10.114.57.10 with HTTP; Wed, 20 Aug 2008 20:27:32 -0700 (PDT) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: ------=_Part_35953_11425781.1219289252249 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline Sorry, had trouble with git send-email. Thanks, Dan ------=_Part_35953_11425781.1219289252249 Content-Type: application/octet-stream; name=0001-Detailed-tools-useful-when-resolving-merge-conflicts.patch Content-Transfer-Encoding: base64 X-Attachment-Id: f_fk4t9xkk0 Content-Disposition: attachment; filename=0001-Detailed-tools-useful-when-resolving-merge-conflicts.patch RnJvbSBiMmNhNTJmOGJhNzBlNjg5Y2Q4ZTk0MjQ3MDc2MjllNGNhMzdmYWIzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEYW4gSGVuc2dlbiA8ZGFuQG1hY2Jvb2suZGFuaGVuc2dlbi5j b20+CkRhdGU6IFdlZCwgMjAgQXVnIDIwMDggMjM6MTQ6MDYgLTA0MDAKU3ViamVjdDogW1BBVENI XSBEZXRhaWxlZCB0b29scyB1c2VmdWwgd2hlbiByZXNvbHZpbmcgbWVyZ2UgY29uZmxpY3RzCgpT aWduZWQtb2ZmLWJ5OiBEYW4gSGVuc2dlbiA8ZGFuQG1ldGhvZGhlYWQuY29tPgotLS0KIERvY3Vt ZW50YXRpb24vZ2l0LW1lcmdlLnR4dCB8ICAgMjcgKysrKysrKysrKysrKysrKysrKystLS0tLS0t CiAxIGZpbGVzIGNoYW5nZWQsIDIwIGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9naXQtbWVyZ2UudHh0IGIvRG9jdW1lbnRhdGlvbi9naXQt bWVyZ2UudHh0CmluZGV4IDE3YTE1YWMuLmJmZjU2YzUgMTAwNjQ0Ci0tLSBhL0RvY3VtZW50YXRp b24vZ2l0LW1lcmdlLnR4dAorKysgYi9Eb2N1bWVudGF0aW9uL2dpdC1tZXJnZS50eHQKQEAgLTEy NiwxMyArMTI2LDI2IEBAIEFmdGVyIHNlZWluZyBhIGNvbmZsaWN0LCB5b3UgY2FuIGRvIHR3byB0 aGluZ3M6CiAgICB1cCB3b3JraW5nIHRyZWUgY2hhbmdlcyBtYWRlIGJ5IDIuIGFuZCAzLjsgJ2dp dC1yZXNldCAtLWhhcmQnIGNhbgogICAgYmUgdXNlZCBmb3IgdGhpcy4KIAotICogUmVzb2x2ZSB0 aGUgY29uZmxpY3RzLiAgYGdpdCBkaWZmYCB3b3VsZCByZXBvcnQgb25seSB0aGUKLSAgIGNvbmZs aWN0aW5nIHBhdGhzIGJlY2F1c2Ugb2YgdGhlIGFib3ZlIDIuIGFuZCAzLgotICAgRWRpdCB0aGUg d29ya2luZyB0cmVlIGZpbGVzIGludG8gYSBkZXNpcmFibGUgc2hhcGUKLSAgICgnZ2l0IG1lcmdl dG9vbCcgY2FuIGVhc2UgdGhpcyB0YXNrKSwgJ2dpdC1hZGQnIG9yICdnaXQtcm0nCi0gICB0aGVt LCB0byBtYWtlIHRoZSBpbmRleCBmaWxlIGNvbnRhaW4gd2hhdCB0aGUgbWVyZ2UgcmVzdWx0Ci0g ICBzaG91bGQgYmUsIGFuZCBydW4gJ2dpdC1jb21taXQnIHRvIGNvbW1pdCB0aGUgcmVzdWx0Lgot CisgKiBSZXNvbHZlIHRoZSBjb25mbGljdHMuICBFZGl0IHRoZSB3b3JraW5nIHRyZWUgZmlsZXMg aW50byBzaGFwZQorICAgYW5kICdnaXQtYWRkJyB0byB0aGUgaW5kZXguICAnZ2l0LWNvbW1pdCcg dG8gc2VhbCB0aGUgZGVhbC4KKworWW91IGNhbiB3b3JrIHRocm91Z2ggY29uZmxpY3Qgd2l0aCBh IG51bWJlciBvZiB0b29sczoKKworICogTG9vayBhdCB0aGUgb3JpZ2luYWxzLiAgJ2dpdCBzaG93 IDoxOmZpbGVuYW1lJyBzaG93cyB0aGUKKyAgIGNvbW1vbiBhbmNlc3RvciwgJ2dpdCBzaG93IDoy OmZpbGVuYW1lJyBzaG93cyB0aGUgSEVBRAorICAgdmVyc2lvbiBhbmQgJ2dpdCBzaG93IDozOmZp bGVuYW1lJyBzaG93cyB0aGUgcmVtb3RlCisgICB2ZXJzaW9uLgorCisgKiBEaWZmIHRoZSBjb25m bGljdHMgYWdhaW5zdCB0aGUgb3JpZ2luYWxzLiAgJ2dpdC1kaWZmIC0tYmFzZScKKyAgIGRpZmZz IGFnYWluc3QgdGhlIGNvbW1vbiBhbmNlc3RvciwgJ2dpdC1kaWZmIC0tb3VycycgZGlmZnMKKyAg IGFnYWluc3QgdGhlIEhFQUQgdmVyc2lvbiBhbmQgJ2dpdC1kaWZmIC0tdGhlaXJzJyBkaWZmcwor ICAgYWdhaW5zdCB0aGUgcmVtb3RlIHZlcnNpb24uCisKKyAqIFVzZSBhIG1lcmdldG9vbC4gICdn aXQgZGlmZiBtZXJnZXRvb2wnIHRvIHN0YXJ0IHRoZSBtZXJnZQorICAgcHJvY2Vzcy4gIEZvdXIg dmVyc2lvbnMgb2YgYSBjb25mbGljdGVkIGZpbGUgZ2V0IHdyaXR0ZW4gYXMKKyAgIHRoZSBtZXJn ZXRvb2wgc3RhcnRzLCBCQVNFLCBMT0NBTCwgUkVNT1RFIGFuZCBCQUNLVVAuCisgICBUaGV5J3Jl IGNyZWF0ZWQgZm9yIHRoZSAgbWVyZ2V0b29sLCBidXQgdGhleSdyZSBoYW5keQorICAgYWx0ZXJu YXRpdmVzIHRvIHRoZSAnZ2l0IHNob3cgOjE6ZmlsZW5hbWUnIGNvbW1hbmQuCiAKIFNFRSBBTFNP CiAtLS0tLS0tLQotLSAKMS41LjYuMgoK ------=_Part_35953_11425781.1219289252249--