From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sebastian Schuberth Subject: Adding Beyond Compare as a merge tool, was: Re: What's cooking in git.git (Feb 2011, #05; Wed, 23) Date: Sat, 26 Feb 2011 11:24:58 +0100 Message-ID: <4D68D4FA.7090500@gmail.com> References: <7v1v2y5o3p.fsf@alter.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------080106030706020608070108" Cc: Junio C Hamano , git@vger.kernel.org, charles@hashpling.org To: judge.packham@gmail.com X-From: git-owner@vger.kernel.org Sat Feb 26 11:25:21 2011 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 1PtHKw-0005zA-5F for gcvg-git-2@lo.gmane.org; Sat, 26 Feb 2011 11:25:19 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751783Ab1BZKZL (ORCPT ); Sat, 26 Feb 2011 05:25:11 -0500 Received: from mail-bw0-f46.google.com ([209.85.214.46]:62498 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751689Ab1BZKZJ (ORCPT ); Sat, 26 Feb 2011 05:25:09 -0500 Received: by bwz15 with SMTP id 15so2582480bwz.19 for ; Sat, 26 Feb 2011 02:25:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:message-id:date:from:user-agent:mime-version :newsgroups:to:cc:subject:references:in-reply-to:content-type; bh=IzyAAVrL1qJYycg+q/J6Yf60VXox0rQdOWBHJYLZ7oA=; b=LzClzgUa6H4lFnQelMSAB3zMf8UlCDhthOAoMbTuPY5sJ6h4cR/i8dVLpJgoki5rpY dSowSDNlSOtVcff9h+pzp7Tv9950w7PS8ckLU/Xs1y2lJqjK58gYY2GuqsPCtl/xVGMx exGAfjShExxnh919Af7Gwd4Dmc2ZQqJ1Wh1V4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:newsgroups:to:cc :subject:references:in-reply-to:content-type; b=TfywnLphDW2Y76f+iJSHqa7+eQ3X4qw8qXoXnu7rUuGquCHFgSBV4I8shSKk+0172i 55r0ktjeXI2vdnEpZBCh7yndRkA1rMrBZ9O09OWU1kb3kkAdkiWaZJL9K+aORqS4hjoX o1w6r8Vkl1kPO2auz+P3mwMD1XMlZrUPxnnBI= Received: by 10.204.99.77 with SMTP id t13mr2868969bkn.164.1298715907094; Sat, 26 Feb 2011 02:25:07 -0800 (PST) Received: from [192.168.178.23] (p5DDB01ED.dip0.t-ipconnect.de [93.219.1.237]) by mx.google.com with ESMTPS id w3sm1029932bkt.17.2011.02.26.02.25.05 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 26 Feb 2011 02:25:05 -0800 (PST) User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.12) Gecko/20080213 Thunderbird/2.0.0.12 Mnenhy/0.7.5.0 Newsgroups: gmane.comp.version-control.git In-Reply-To: <7v1v2y5o3p.fsf@alter.siamese.dyndns.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: This is a multi-part message in MIME format. --------------080106030706020608070108 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 24.02.2011 00:26, Junio C Hamano wrote: > * cp/mergetool-beyondcompare (2011-02-18) 1 commit > - mergetool--lib: add support for beyond compare Sorry for not responding earlier to this, but problems at my news provider seem to have swallowed mails from several days, including the original post of http://marc.info/?l=git&m=129801656713478&w=2 A while ago, I had already proposed http://marc.info/?l=git&m=129007741814521&w=2 I'm not entirely sure why it was ignored in the end, probably I did not report back to have tested it in Linux. A few things that I like better in my patch than in Chris': - Beyond Compare is added as "bc3" instead of "bcompare", which is both shorter and indicates that only version 3, not version 2, is supported. - Chris seems to be missing the patch to git-gui/lib/mergetool.tcl - To the best of my knownledge, the Beyond Compare executable is called "BCompare" (note the case), that means even with the merge tool named "bcompare" a translation step in git-mergetool--lib.sh should by required (as done in my patch). Chris, as you seem to have tested ion Linux, could you shed a light on this? - Using dashes for the options to Beyond Compare is fine on Windows, however, I believe the order of the files is wrong, although that might be a bit subjective. For a 3-way merge the syntax is BCompare.exe C:\Left.ext C:\Right.ext C:\Center.ext So the file that should go to the center panel is specified last. AFAIK, all other merge tools are called such that $BASE goes to the center. This is why my patch specifies $BASE last. Any more opinions? Chris, in case you'd agree to prefer my patch, I'd be very grateful if you could test it on Linux. For your convenience, I've rebased onto the current master and attached the patch files. -- Sebastian Schuberth --------------080106030706020608070108 Content-Type: text/plain; name="0001-mergetool-lib-Sort-tools-alphabetically-for-easier-l.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0001-mergetool-lib-Sort-tools-alphabetically-for-easier-l.pa"; filename*1="tch" RnJvbSA5MDE2YzBjMGZiYWNiYTI3NDdmYzAwMjNjODUzZWRkNmEzZDBkYTg3IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBTZWJhc3RpYW4gU2NodWJlcnRoIDxzc2NodWJlcnRo QGdtYWlsLmNvbT4KRGF0ZTogVGh1LCAxOCBOb3YgMjAxMCAxMDoyMzo1MSArMDEwMApTdWJq ZWN0OiBbUEFUQ0ggMS8zXSBtZXJnZXRvb2wtLWxpYjogU29ydCB0b29scyBhbHBoYWJldGlj YWxseSBmb3IgZWFzaWVyIGxvb2t1cAoKClNpZ25lZC1vZmYtYnk6IFNlYmFzdGlhbiBTY2h1 YmVydGggPHNzY2h1YmVydGhAZ21haWwuY29tPgotLS0KIERvY3VtZW50YXRpb24vZ2l0LWRp ZmZ0b29sLnR4dCAgfCAgICA0ICstCiBEb2N1bWVudGF0aW9uL2dpdC1tZXJnZXRvb2wudHh0 IHwgICAgNCArLQogRG9jdW1lbnRhdGlvbi9tZXJnZS1jb25maWcudHh0ICB8ICAgIDggKy0K IGdpdC1ndWkvbGliL21lcmdldG9vbC50Y2wgICAgICAgfCAgIDk0ICsrKysrKysrLS0tLS0t LS0KIGdpdC1tZXJnZXRvb2wtLWxpYi5zaCAgICAgICAgICAgfCAgMjQ1ICsrKysrKysrKysr KysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLQogNSBmaWxlcyBjaGFuZ2VkLCAxNzcgaW5z ZXJ0aW9ucygrKSwgMTc4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRp b24vZ2l0LWRpZmZ0b29sLnR4dCBiL0RvY3VtZW50YXRpb24vZ2l0LWRpZmZ0b29sLnR4dApp bmRleCBkYjg3ZjFkLi40Yzg4MjVkIDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL2dpdC1k aWZmdG9vbC50eHQKKysrIGIvRG9jdW1lbnRhdGlvbi9naXQtZGlmZnRvb2wudHh0CkBAIC0z MSw4ICszMSw4IEBAIE9QVElPTlMKIC0tdG9vbD08dG9vbD46OgogCVVzZSB0aGUgZGlmZiB0 b29sIHNwZWNpZmllZCBieSA8dG9vbD4uCiAJVmFsaWQgbWVyZ2UgdG9vbHMgYXJlOgotCWtk aWZmMywga29tcGFyZSwgdGtkaWZmLCBtZWxkLCB4eGRpZmYsIGVtZXJnZSwgdmltZGlmZiwg Z3ZpbWRpZmYsCi0JZWNtZXJnZSwgZGlmZnVzZSwgb3BlbmRpZmYsIHA0bWVyZ2UgYW5kIGFy YXhpcy4KKwlhcmF4aXMsIGRpZmZ1c2UsIGVtZXJnZSwgZWNtZXJnZSwgZ3ZpbWRpZmYsIGtk aWZmMywKKwlrb21wYXJlLCBtZWxkLCBvcGVuZGlmZiwgcDRtZXJnZSwgdGtkaWZmLCB2aW1k aWZmIGFuZCB4eGRpZmYuCiArCiBJZiBhIGRpZmYgdG9vbCBpcyBub3Qgc3BlY2lmaWVkLCAn Z2l0IGRpZmZ0b29sJwogd2lsbCB1c2UgdGhlIGNvbmZpZ3VyYXRpb24gdmFyaWFibGUgYGRp ZmYudG9vbGAuICBJZiB0aGUKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vZ2l0LW1lcmdl dG9vbC50eHQgYi9Eb2N1bWVudGF0aW9uL2dpdC1tZXJnZXRvb2wudHh0CmluZGV4IDFmNzVh ODQuLjQ5ODcyNDUgMTAwNjQ0Ci0tLSBhL0RvY3VtZW50YXRpb24vZ2l0LW1lcmdldG9vbC50 eHQKKysrIGIvRG9jdW1lbnRhdGlvbi9naXQtbWVyZ2V0b29sLnR4dApAQCAtMjYsOCArMjYs OCBAQCBPUFRJT05TCiAtLXRvb2w9PHRvb2w+OjoKIAlVc2UgdGhlIG1lcmdlIHJlc29sdXRp b24gcHJvZ3JhbSBzcGVjaWZpZWQgYnkgPHRvb2w+LgogCVZhbGlkIG1lcmdlIHRvb2xzIGFy ZToKLQlrZGlmZjMsIHRrZGlmZiwgbWVsZCwgeHhkaWZmLCBlbWVyZ2UsIHZpbWRpZmYsIGd2 aW1kaWZmLCBlY21lcmdlLAotCWRpZmZ1c2UsIHRvcnRvaXNlbWVyZ2UsIG9wZW5kaWZmLCBw NG1lcmdlIGFuZCBhcmF4aXMuCisJYXJheGlzLCBkaWZmdXNlLCBlY21lcmdlLCBlbWVyZ2Us IGd2aW1kaWZmLCBrZGlmZjMsCisJbWVsZCwgb3BlbmRpZmYsIHA0bWVyZ2UsIHRrZGlmZiwg dG9ydG9pc2VtZXJnZSwgdmltZGlmZiBhbmQgeHhkaWZmLgogKwogSWYgYSBtZXJnZSByZXNv bHV0aW9uIHByb2dyYW0gaXMgbm90IHNwZWNpZmllZCwgJ2dpdCBtZXJnZXRvb2wnCiB3aWxs IHVzZSB0aGUgY29uZmlndXJhdGlvbiB2YXJpYWJsZSBgbWVyZ2UudG9vbGAuICBJZiB0aGUK ZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vbWVyZ2UtY29uZmlnLnR4dCBiL0RvY3VtZW50 YXRpb24vbWVyZ2UtY29uZmlnLnR4dAppbmRleCAxZTVjMjJjLi45MDU4N2RiIDEwMDY0NAot LS0gYS9Eb2N1bWVudGF0aW9uL21lcmdlLWNvbmZpZy50eHQKKysrIGIvRG9jdW1lbnRhdGlv bi9tZXJnZS1jb25maWcudHh0CkBAIC0zMywxMCArMzMsMTAgQEAgbWVyZ2Uuc3RhdDo6CiAK IG1lcmdlLnRvb2w6OgogCUNvbnRyb2xzIHdoaWNoIG1lcmdlIHJlc29sdXRpb24gcHJvZ3Jh bSBpcyB1c2VkIGJ5Ci0JbGlua2dpdDpnaXQtbWVyZ2V0b29sWzFdLiAgVmFsaWQgYnVpbHQt aW4gdmFsdWVzIGFyZTogImtkaWZmMyIsCi0JInRrZGlmZiIsICJtZWxkIiwgInh4ZGlmZiIs ICJlbWVyZ2UiLCAidmltZGlmZiIsICJndmltZGlmZiIsCi0JImRpZmZ1c2UiLCAiZWNtZXJn ZSIsICJ0b3J0b2lzZW1lcmdlIiwgInA0bWVyZ2UiLCAiYXJheGlzIiBhbmQKLQkib3BlbmRp ZmYiLiAgQW55IG90aGVyIHZhbHVlIGlzIHRyZWF0ZWQgaXMgY3VzdG9tIG1lcmdlIHRvb2wK KwlsaW5rZ2l0OmdpdC1tZXJnZXRvb2xbMV0uICBWYWxpZCBidWlsdC1pbiB2YWx1ZXMgYXJl OiAiYXJheGlzIiwKKwkiZGlmZnVzZSIsICJlY21lcmdlIiwgImVtZXJnZSIsICJndmltZGlm ZiIsICJrZGlmZjMiLCAibWVsZCIsCisJIm9wZW5kaWZmIiwgInA0bWVyZ2UiLCAidGtkaWZm IiwgInRvcnRvaXNlbWVyZ2UiLCAidmltZGlmZiIKKwlhbmQgInh4ZGlmZiIuICBBbnkgb3Ro ZXIgdmFsdWUgaXMgdHJlYXRlZCBpcyBjdXN0b20gbWVyZ2UgdG9vbAogCWFuZCB0aGVyZSBt dXN0IGJlIGEgY29ycmVzcG9uZGluZyBtZXJnZXRvb2wuPHRvb2w+LmNtZCBvcHRpb24uCiAK IG1lcmdlLnZlcmJvc2l0eTo6CmRpZmYgLS1naXQgYS9naXQtZ3VpL2xpYi9tZXJnZXRvb2wu dGNsIGIvZ2l0LWd1aS9saWIvbWVyZ2V0b29sLnRjbAppbmRleCAzZmU5MGU2Li4yNDllMGNm IDEwMDY0NAotLS0gYS9naXQtZ3VpL2xpYi9tZXJnZXRvb2wudGNsCisrKyBiL2dpdC1ndWkv bGliL21lcmdldG9vbC50Y2wKQEAgLTE3NSw0MyArMTc1LDQ5IEBAIHByb2MgbWVyZ2VfcmVz b2x2ZV90b29sMiB7fSB7CiAKIAkjIEJ1aWxkIHRoZSBjb21tYW5kIGxpbmUKIAlzd2l0Y2gg LS0gJHRvb2wgewotCWtkaWZmMyB7CisJYXJheGlzIHsKIAkJaWYgeyRiYXNlX3N0YWdlIG5l IHt9fSB7Ci0JCQlzZXQgY21kbGluZSBbbGlzdCAiJG1lcmdlX3Rvb2xfcGF0aCIgLS1hdXRv IC0tTDEgIiRNRVJHRUQgKEJhc2UpIiBcCi0JCQkJLS1MMiAiJE1FUkdFRCAoTG9jYWwpIiAt LUwzICIkTUVSR0VEIChSZW1vdGUpIiAtbyAiJE1FUkdFRCIgIiRCQVNFIiAiJExPQ0FMIiAi JFJFTU9URSJdCisJCQlzZXQgY21kbGluZSBbbGlzdCAiJG1lcmdlX3Rvb2xfcGF0aCIgLXdh aXQgLW1lcmdlIC0zIC1hMSBcCisJCQkJLXRpdGxlMToiJyRNRVJHRUQgKEJhc2UpJyIgLXRp dGxlMjoiJyRNRVJHRUQgKExvY2FsKSciIFwKKwkJCQktdGl0bGUzOiInJE1FUkdFRCAoUmVt b3RlKSciIFwKKwkJCQkiJEJBU0UiICIkTE9DQUwiICIkUkVNT1RFIiAiJE1FUkdFRCJdCiAJ CX0gZWxzZSB7Ci0JCQlzZXQgY21kbGluZSBbbGlzdCAiJG1lcmdlX3Rvb2xfcGF0aCIgLS1h dXRvIC0tTDEgIiRNRVJHRUQgKExvY2FsKSIgXAotCQkJCS0tTDIgIiRNRVJHRUQgKFJlbW90 ZSkiIC1vICIkTUVSR0VEIiAiJExPQ0FMIiAiJFJFTU9URSJdCisJCQlzZXQgY21kbGluZSBb bGlzdCAiJG1lcmdlX3Rvb2xfcGF0aCIgLXdhaXQgLTIgXAorCQkJCSAtdGl0bGUxOiInJE1F UkdFRCAoTG9jYWwpJyIgLXRpdGxlMjoiJyRNRVJHRUQgKFJlbW90ZSknIiBcCisJCQkJICIk TE9DQUwiICIkUkVNT1RFIiAiJE1FUkdFRCJdCiAJCX0KIAl9Ci0JdGtkaWZmIHsKKwllY21l cmdlIHsKIAkJaWYgeyRiYXNlX3N0YWdlIG5lIHt9fSB7Ci0JCQlzZXQgY21kbGluZSBbbGlz dCAiJG1lcmdlX3Rvb2xfcGF0aCIgLWEgIiRCQVNFIiAtbyAiJE1FUkdFRCIgIiRMT0NBTCIg IiRSRU1PVEUiXQorCQkJc2V0IGNtZGxpbmUgW2xpc3QgIiRtZXJnZV90b29sX3BhdGgiICIk QkFTRSIgIiRMT0NBTCIgIiRSRU1PVEUiIC0tZGVmYXVsdCAtLW1vZGU9bWVyZ2UzIC0tdG89 IiRNRVJHRUQiXQogCQl9IGVsc2UgewotCQkJc2V0IGNtZGxpbmUgW2xpc3QgIiRtZXJnZV90 b29sX3BhdGgiIC1vICIkTUVSR0VEIiAiJExPQ0FMIiAiJFJFTU9URSJdCisJCQlzZXQgY21k bGluZSBbbGlzdCAiJG1lcmdlX3Rvb2xfcGF0aCIgIiRMT0NBTCIgIiRSRU1PVEUiIC0tZGVm YXVsdCAtLW1vZGU9bWVyZ2UyIC0tdG89IiRNRVJHRUQiXQogCQl9CiAJfQotCW1lbGQgewot CQlzZXQgY21kbGluZSBbbGlzdCAiJG1lcmdlX3Rvb2xfcGF0aCIgIiRMT0NBTCIgIiRNRVJH RUQiICIkUkVNT1RFIl0KKwllbWVyZ2UgeworCQlpZiB7JGJhc2Vfc3RhZ2UgbmUge319IHsK KwkJCXNldCBjbWRsaW5lIFtsaXN0ICIkbWVyZ2VfdG9vbF9wYXRoIiAtZiBlbWVyZ2UtZmls ZXMtd2l0aC1hbmNlc3Rvci1jb21tYW5kIFwKKwkJCQkJIiRMT0NBTCIgIiRSRU1PVEUiICIk QkFTRSIgIiRiYXNlbmFtZSJdCisJCX0gZWxzZSB7CisJCQlzZXQgY21kbGluZSBbbGlzdCAi JG1lcmdlX3Rvb2xfcGF0aCIgLWYgZW1lcmdlLWZpbGVzLWNvbW1hbmQgXAorCQkJCQkiJExP Q0FMIiAiJFJFTU9URSIgIiRiYXNlbmFtZSJdCisJCX0KIAl9CiAJZ3ZpbWRpZmYgewogCQlz ZXQgY21kbGluZSBbbGlzdCAiJG1lcmdlX3Rvb2xfcGF0aCIgLWYgIiRMT0NBTCIgIiRNRVJH RUQiICIkUkVNT1RFIl0KIAl9Ci0JeHhkaWZmIHsKKwlrZGlmZjMgewogCQlpZiB7JGJhc2Vf c3RhZ2UgbmUge319IHsKLQkJCXNldCBjbWRsaW5lIFtsaXN0ICIkbWVyZ2VfdG9vbF9wYXRo IiAtWCAtLXNob3ctbWVyZ2VkLXBhbmUgXAotCQkJCQkgICAgLVIge0FjY2VsLlNhdmVBc01l cmdlZDogIkN0cmwtUyJ9IFwKLQkJCQkJICAgIC1SIHtBY2NlbC5TZWFyY2g6ICJDdHJsK0Yi fSBcCi0JCQkJCSAgICAtUiB7QWNjZWwuU2VhcmNoRm9yd2FyZDogIkN0cmwtRyJ9IFwKLQkJ CQkJICAgIC0tbWVyZ2VkLWZpbGUgIiRNRVJHRUQiICIkTE9DQUwiICIkQkFTRSIgIiRSRU1P VEUiXQorCQkJc2V0IGNtZGxpbmUgW2xpc3QgIiRtZXJnZV90b29sX3BhdGgiIC0tYXV0byAt LUwxICIkTUVSR0VEIChCYXNlKSIgXAorCQkJCS0tTDIgIiRNRVJHRUQgKExvY2FsKSIgLS1M MyAiJE1FUkdFRCAoUmVtb3RlKSIgLW8gIiRNRVJHRUQiICIkQkFTRSIgIiRMT0NBTCIgIiRS RU1PVEUiXQogCQl9IGVsc2UgewotCQkJc2V0IGNtZGxpbmUgW2xpc3QgIiRtZXJnZV90b29s X3BhdGgiIC1YIC0tc2hvdy1tZXJnZWQtcGFuZSBcCi0JCQkJCSAgICAtUiB7QWNjZWwuU2F2 ZUFzTWVyZ2VkOiAiQ3RybC1TIn0gXAotCQkJCQkgICAgLVIge0FjY2VsLlNlYXJjaDogIkN0 cmwrRiJ9IFwKLQkJCQkJICAgIC1SIHtBY2NlbC5TZWFyY2hGb3J3YXJkOiAiQ3RybC1HIn0g XAotCQkJCQkgICAgLS1tZXJnZWQtZmlsZSAiJE1FUkdFRCIgIiRMT0NBTCIgIiRSRU1PVEUi XQorCQkJc2V0IGNtZGxpbmUgW2xpc3QgIiRtZXJnZV90b29sX3BhdGgiIC0tYXV0byAtLUwx ICIkTUVSR0VEIChMb2NhbCkiIFwKKwkJCQktLUwyICIkTUVSR0VEIChSZW1vdGUpIiAtbyAi JE1FUkdFRCIgIiRMT0NBTCIgIiRSRU1PVEUiXQogCQl9CiAJfQorCW1lbGQgeworCQlzZXQg Y21kbGluZSBbbGlzdCAiJG1lcmdlX3Rvb2xfcGF0aCIgIiRMT0NBTCIgIiRNRVJHRUQiICIk UkVNT1RFIl0KKwl9CiAJb3BlbmRpZmYgewogCQlpZiB7JGJhc2Vfc3RhZ2UgbmUge319IHsK IAkJCXNldCBjbWRsaW5lIFtsaXN0ICIkbWVyZ2VfdG9vbF9wYXRoIiAiJExPQ0FMIiAiJFJF TU9URSIgLWFuY2VzdG9yICIkQkFTRSIgLW1lcmdlICIkTUVSR0VEIl0KQEAgLTIxOSwyMiAr MjI1LDIwIEBAIHByb2MgbWVyZ2VfcmVzb2x2ZV90b29sMiB7fSB7CiAJCQlzZXQgY21kbGlu ZSBbbGlzdCAiJG1lcmdlX3Rvb2xfcGF0aCIgIiRMT0NBTCIgIiRSRU1PVEUiIC1tZXJnZSAi JE1FUkdFRCJdCiAJCX0KIAl9Ci0JZWNtZXJnZSB7Ci0JCWlmIHskYmFzZV9zdGFnZSBuZSB7 fX0gewotCQkJc2V0IGNtZGxpbmUgW2xpc3QgIiRtZXJnZV90b29sX3BhdGgiICIkQkFTRSIg IiRMT0NBTCIgIiRSRU1PVEUiIC0tZGVmYXVsdCAtLW1vZGU9bWVyZ2UzIC0tdG89IiRNRVJH RUQiXQotCQl9IGVsc2UgewotCQkJc2V0IGNtZGxpbmUgW2xpc3QgIiRtZXJnZV90b29sX3Bh dGgiICIkTE9DQUwiICIkUkVNT1RFIiAtLWRlZmF1bHQgLS1tb2RlPW1lcmdlMiAtLXRvPSIk TUVSR0VEIl0KLQkJfQorCXA0bWVyZ2UgeworCQlzZXQgY21kbGluZSBbbGlzdCAiJG1lcmdl X3Rvb2xfcGF0aCIgIiRCQVNFIiAiJFJFTU9URSIgIiRMT0NBTCIgIiRNRVJHRUQiXQogCX0K LQllbWVyZ2UgeworCXRrZGlmZiB7CiAJCWlmIHskYmFzZV9zdGFnZSBuZSB7fX0gewotCQkJ c2V0IGNtZGxpbmUgW2xpc3QgIiRtZXJnZV90b29sX3BhdGgiIC1mIGVtZXJnZS1maWxlcy13 aXRoLWFuY2VzdG9yLWNvbW1hbmQgXAotCQkJCQkiJExPQ0FMIiAiJFJFTU9URSIgIiRCQVNF IiAiJGJhc2VuYW1lIl0KKwkJCXNldCBjbWRsaW5lIFtsaXN0ICIkbWVyZ2VfdG9vbF9wYXRo IiAtYSAiJEJBU0UiIC1vICIkTUVSR0VEIiAiJExPQ0FMIiAiJFJFTU9URSJdCiAJCX0gZWxz ZSB7Ci0JCQlzZXQgY21kbGluZSBbbGlzdCAiJG1lcmdlX3Rvb2xfcGF0aCIgLWYgZW1lcmdl LWZpbGVzLWNvbW1hbmQgXAotCQkJCQkiJExPQ0FMIiAiJFJFTU9URSIgIiRiYXNlbmFtZSJd CisJCQlzZXQgY21kbGluZSBbbGlzdCAiJG1lcmdlX3Rvb2xfcGF0aCIgLW8gIiRNRVJHRUQi ICIkTE9DQUwiICIkUkVNT1RFIl0KIAkJfQogCX0KKwl2aW1kaWZmIHsKKwkJZXJyb3JfcG9w dXAgW21jICJOb3QgYSBHVUkgbWVyZ2UgdG9vbDogJyVzJyIgJHRvb2xdCisJCXJldHVybgor CX0KIAl3aW5tZXJnZSB7CiAJCWlmIHskYmFzZV9zdGFnZSBuZSB7fX0gewogCQkJIyBUaGlz IHRvb2wgZG9lcyBub3Qgc3VwcG9ydCAzLXdheSBtZXJnZXMuCkBAIC0yNDUsMjUgKzI0OSwy MSBAQCBwcm9jIG1lcmdlX3Jlc29sdmVfdG9vbDIge30gewogCQkJCS1kbCAiVGhlaXJzIEZp bGUiIC1kciAiTWluZSBGaWxlIiAiJFJFTU9URSIgIiRMT0NBTCIgIiRNRVJHRUQiXQogCQl9 CiAJfQotCWFyYXhpcyB7CisJeHhkaWZmIHsKIAkJaWYgeyRiYXNlX3N0YWdlIG5lIHt9fSB7 Ci0JCQlzZXQgY21kbGluZSBbbGlzdCAiJG1lcmdlX3Rvb2xfcGF0aCIgLXdhaXQgLW1lcmdl IC0zIC1hMSBcCi0JCQkJLXRpdGxlMToiJyRNRVJHRUQgKEJhc2UpJyIgLXRpdGxlMjoiJyRN RVJHRUQgKExvY2FsKSciIFwKLQkJCQktdGl0bGUzOiInJE1FUkdFRCAoUmVtb3RlKSciIFwK LQkJCQkiJEJBU0UiICIkTE9DQUwiICIkUkVNT1RFIiAiJE1FUkdFRCJdCisJCQlzZXQgY21k bGluZSBbbGlzdCAiJG1lcmdlX3Rvb2xfcGF0aCIgLVggLS1zaG93LW1lcmdlZC1wYW5lIFwK KwkJCQkJICAgIC1SIHtBY2NlbC5TYXZlQXNNZXJnZWQ6ICJDdHJsLVMifSBcCisJCQkJCSAg ICAtUiB7QWNjZWwuU2VhcmNoOiAiQ3RybCtGIn0gXAorCQkJCQkgICAgLVIge0FjY2VsLlNl YXJjaEZvcndhcmQ6ICJDdHJsLUcifSBcCisJCQkJCSAgICAtLW1lcmdlZC1maWxlICIkTUVS R0VEIiAiJExPQ0FMIiAiJEJBU0UiICIkUkVNT1RFIl0KIAkJfSBlbHNlIHsKLQkJCXNldCBj bWRsaW5lIFtsaXN0ICIkbWVyZ2VfdG9vbF9wYXRoIiAtd2FpdCAtMiBcCi0JCQkJIC10aXRs ZTE6IickTUVSR0VEIChMb2NhbCknIiAtdGl0bGUyOiInJE1FUkdFRCAoUmVtb3RlKSciIFwK LQkJCQkgIiRMT0NBTCIgIiRSRU1PVEUiICIkTUVSR0VEIl0KKwkJCXNldCBjbWRsaW5lIFts aXN0ICIkbWVyZ2VfdG9vbF9wYXRoIiAtWCAtLXNob3ctbWVyZ2VkLXBhbmUgXAorCQkJCQkg ICAgLVIge0FjY2VsLlNhdmVBc01lcmdlZDogIkN0cmwtUyJ9IFwKKwkJCQkJICAgIC1SIHtB Y2NlbC5TZWFyY2g6ICJDdHJsK0YifSBcCisJCQkJCSAgICAtUiB7QWNjZWwuU2VhcmNoRm9y d2FyZDogIkN0cmwtRyJ9IFwKKwkJCQkJICAgIC0tbWVyZ2VkLWZpbGUgIiRNRVJHRUQiICIk TE9DQUwiICIkUkVNT1RFIl0KIAkJfQogCX0KLQlwNG1lcmdlIHsKLQkJc2V0IGNtZGxpbmUg W2xpc3QgIiRtZXJnZV90b29sX3BhdGgiICIkQkFTRSIgIiRSRU1PVEUiICIkTE9DQUwiICIk TUVSR0VEIl0KLQl9Ci0JdmltZGlmZiB7Ci0JCWVycm9yX3BvcHVwIFttYyAiTm90IGEgR1VJ IG1lcmdlIHRvb2w6ICclcyciICR0b29sXQotCQlyZXR1cm4KLQl9CiAJZGVmYXVsdCB7CiAJ CWVycm9yX3BvcHVwIFttYyAiVW5zdXBwb3J0ZWQgbWVyZ2UgdG9vbCAnJXMnIiAkdG9vbF0K IAkJcmV0dXJuCmRpZmYgLS1naXQgYS9naXQtbWVyZ2V0b29sLS1saWIuc2ggYi9naXQtbWVy Z2V0b29sLS1saWIuc2gKaW5kZXggNzdkNGFlZS4uOWZiODJlNSAxMDA2NDQKLS0tIGEvZ2l0 LW1lcmdldG9vbC0tbGliLnNoCisrKyBiL2dpdC1tZXJnZXRvb2wtLWxpYi5zaApAQCAtMTAs MTcgKzEwLDE3IEBAIG1lcmdlX21vZGUoKSB7CiAKIHRyYW5zbGF0ZV9tZXJnZV90b29sX3Bh dGggKCkgewogCWNhc2UgIiQxIiBpbgotCXZpbWRpZmZ8dmltZGlmZjIpCi0JCWVjaG8gdmlt Ci0JCTs7Ci0JZ3ZpbWRpZmZ8Z3ZpbWRpZmYyKQotCQllY2hvIGd2aW0KKwlhcmF4aXMpCisJ CWVjaG8gY29tcGFyZQogCQk7OwogCWVtZXJnZSkKIAkJZWNobyBlbWFjcwogCQk7OwotCWFy YXhpcykKLQkJZWNobyBjb21wYXJlCisJZ3ZpbWRpZmZ8Z3ZpbWRpZmYyKQorCQllY2hvIGd2 aW0KKwkJOzsKKwl2aW1kaWZmfHZpbWRpZmYyKQorCQllY2hvIHZpbQogCQk7OwogCSopCiAJ CWVjaG8gIiQxIgpAQCAtNDYsMTcgKzQ2LDE2IEBAIGNoZWNrX3VuY2hhbmdlZCAoKSB7CiAK IHZhbGlkX3Rvb2wgKCkgewogCWNhc2UgIiQxIiBpbgotCWtkaWZmMyB8IHRrZGlmZiB8IHh4 ZGlmZiB8IG1lbGQgfCBvcGVuZGlmZiB8IFwKLQl2aW1kaWZmIHwgZ3ZpbWRpZmYgfCB2aW1k aWZmMiB8IGd2aW1kaWZmMiB8IFwKLQllbWVyZ2UgfCBlY21lcmdlIHwgZGlmZnVzZSB8IGFy YXhpcyB8IHA0bWVyZ2UpCisJYXJheGlzIHwgZGlmZnVzZSB8IGVjbWVyZ2UgfCBlbWVyZ2Ug fCBndmltZGlmZiB8IGd2aW1kaWZmMiB8IFwKKwlrZGlmZjMgfCBtZWxkIHwgb3BlbmRpZmYg fCBwNG1lcmdlIHwgdGtkaWZmIHwgdmltZGlmZiB8IHZpbWRpZmYyIHwgeHhkaWZmKQogCQk7 OyAjIGhhcHB5Ci0JdG9ydG9pc2VtZXJnZSkKLQkJaWYgISBtZXJnZV9tb2RlOyB0aGVuCisJ a29tcGFyZSkKKwkJaWYgISBkaWZmX21vZGU7IHRoZW4KIAkJCXJldHVybiAxCiAJCWZpCiAJ CTs7Ci0Ja29tcGFyZSkKLQkJaWYgISBkaWZmX21vZGU7IHRoZW4KKwl0b3J0b2lzZW1lcmdl KQorCQlpZiAhIG1lcmdlX21vZGU7IHRoZW4KIAkJCXJldHVybiAxCiAJCWZpCiAJCTs7CkBA IC04OSw2OSArODgsMjIgQEAgcnVuX21lcmdlX3Rvb2wgKCkgewogCXN0YXR1cz0wCiAKIAlj YXNlICIkMSIgaW4KLQlrZGlmZjMpCi0JCWlmIG1lcmdlX21vZGU7IHRoZW4KLQkJCWlmICRi YXNlX3ByZXNlbnQ7IHRoZW4KLQkJCQkoIiRtZXJnZV90b29sX3BhdGgiIC0tYXV0byBcCi0J CQkJCS0tTDEgIiRNRVJHRUQgKEJhc2UpIiBcCi0JCQkJCS0tTDIgIiRNRVJHRUQgKExvY2Fs KSIgXAotCQkJCQktLUwzICIkTUVSR0VEIChSZW1vdGUpIiBcCi0JCQkJCS1vICIkTUVSR0VE IiBcCi0JCQkJCSIkQkFTRSIgIiRMT0NBTCIgIiRSRU1PVEUiIFwKLQkJCQk+IC9kZXYvbnVs bCAyPiYxKQotCQkJZWxzZQotCQkJCSgiJG1lcmdlX3Rvb2xfcGF0aCIgLS1hdXRvIFwKLQkJ CQkJLS1MMSAiJE1FUkdFRCAoTG9jYWwpIiBcCi0JCQkJCS0tTDIgIiRNRVJHRUQgKFJlbW90 ZSkiIFwKLQkJCQkJLW8gIiRNRVJHRUQiIFwKLQkJCQkJIiRMT0NBTCIgIiRSRU1PVEUiIFwK LQkJCQk+IC9kZXYvbnVsbCAyPiYxKQotCQkJZmkKLQkJCXN0YXR1cz0kPwotCQllbHNlCi0J CQkoIiRtZXJnZV90b29sX3BhdGgiIC0tYXV0byBcCi0JCQkJLS1MMSAiJE1FUkdFRCAoQSki IFwKLQkJCQktLUwyICIkTUVSR0VEIChCKSIgIiRMT0NBTCIgIiRSRU1PVEUiIFwKLQkJCT4g L2Rldi9udWxsIDI+JjEpCi0JCWZpCi0JCTs7Ci0Ja29tcGFyZSkKLQkJIiRtZXJnZV90b29s X3BhdGgiICIkTE9DQUwiICIkUkVNT1RFIgotCQk7OwotCXRrZGlmZikKLQkJaWYgbWVyZ2Vf bW9kZTsgdGhlbgotCQkJaWYgJGJhc2VfcHJlc2VudDsgdGhlbgotCQkJCSIkbWVyZ2VfdG9v bF9wYXRoIiAtYSAiJEJBU0UiIFwKLQkJCQkJLW8gIiRNRVJHRUQiICIkTE9DQUwiICIkUkVN T1RFIgotCQkJZWxzZQotCQkJCSIkbWVyZ2VfdG9vbF9wYXRoIiBcCi0JCQkJCS1vICIkTUVS R0VEIiAiJExPQ0FMIiAiJFJFTU9URSIKLQkJCWZpCi0JCQlzdGF0dXM9JD8KLQkJZWxzZQot CQkJIiRtZXJnZV90b29sX3BhdGgiICIkTE9DQUwiICIkUkVNT1RFIgotCQlmaQotCQk7Owot CXA0bWVyZ2UpCisJYXJheGlzKQogCQlpZiBtZXJnZV9tb2RlOyB0aGVuCi0JCSAgICB0b3Vj aCAiJEJBQ0tVUCIKKwkJCXRvdWNoICIkQkFDS1VQIgogCQkJaWYgJGJhc2VfcHJlc2VudDsg dGhlbgotCQkJCSIkbWVyZ2VfdG9vbF9wYXRoIiAiJEJBU0UiICIkTE9DQUwiICIkUkVNT1RF IiAiJE1FUkdFRCIKKwkJCQkiJG1lcmdlX3Rvb2xfcGF0aCIgLXdhaXQgLW1lcmdlIC0zIC1h MSBcCisJCQkJCSIkQkFTRSIgIiRMT0NBTCIgIiRSRU1PVEUiICIkTUVSR0VEIiBcCisJCQkJ CT4vZGV2L251bGwgMj4mMQogCQkJZWxzZQotCQkJCSIkbWVyZ2VfdG9vbF9wYXRoIiAiJExP Q0FMIiAiJExPQ0FMIiAiJFJFTU9URSIgIiRNRVJHRUQiCisJCQkJIiRtZXJnZV90b29sX3Bh dGgiIC13YWl0IC0yIFwKKwkJCQkJIiRMT0NBTCIgIiRSRU1PVEUiICIkTUVSR0VEIiBcCisJ CQkJCT4vZGV2L251bGwgMj4mMQogCQkJZmkKIAkJCWNoZWNrX3VuY2hhbmdlZAogCQllbHNl Ci0JCQkiJG1lcmdlX3Rvb2xfcGF0aCIgIiRMT0NBTCIgIiRSRU1PVEUiCi0JCWZpCi0JCTs7 Ci0JbWVsZCkKLQkJaWYgbWVyZ2VfbW9kZTsgdGhlbgotCQkJdG91Y2ggIiRCQUNLVVAiCi0J CQkiJG1lcmdlX3Rvb2xfcGF0aCIgIiRMT0NBTCIgIiRNRVJHRUQiICIkUkVNT1RFIgotCQkJ Y2hlY2tfdW5jaGFuZ2VkCi0JCWVsc2UKLQkJCSIkbWVyZ2VfdG9vbF9wYXRoIiAiJExPQ0FM IiAiJFJFTU9URSIKKwkJCSIkbWVyZ2VfdG9vbF9wYXRoIiAtd2FpdCAtMiAiJExPQ0FMIiAi JFJFTU9URSIgXAorCQkJCT4vZGV2L251bGwgMj4mMQogCQlmaQogCQk7OwogCWRpZmZ1c2Up CkBAIC0xNzAsMjMgKzEyMiw1OCBAQCBydW5fbWVyZ2VfdG9vbCAoKSB7CiAJCQkiJG1lcmdl X3Rvb2xfcGF0aCIgIiRMT0NBTCIgIiRSRU1PVEUiIHwgY2F0CiAJCWZpCiAJCTs7Ci0Jdmlt ZGlmZnxndmltZGlmZikKKwllY21lcmdlKQogCQlpZiBtZXJnZV9tb2RlOyB0aGVuCiAJCQl0 b3VjaCAiJEJBQ0tVUCIKIAkJCWlmICRiYXNlX3ByZXNlbnQ7IHRoZW4KLQkJCQkiJG1lcmdl X3Rvb2xfcGF0aCIgLWYgLWQgLWMgIndpbmNtZCBKIiBcCi0JCQkJCSIkTUVSR0VEIiAiJExP Q0FMIiAiJEJBU0UiICIkUkVNT1RFIgorCQkJCSIkbWVyZ2VfdG9vbF9wYXRoIiAiJEJBU0Ui ICIkTE9DQUwiICIkUkVNT1RFIiBcCisJCQkJCS0tZGVmYXVsdCAtLW1vZGU9bWVyZ2UzIC0t dG89IiRNRVJHRUQiCiAJCQllbHNlCi0JCQkJIiRtZXJnZV90b29sX3BhdGgiIC1mIC1kIC1j ICJ3aW5jbWQgbCIgXAotCQkJCQkiJExPQ0FMIiAiJE1FUkdFRCIgIiRSRU1PVEUiCisJCQkJ IiRtZXJnZV90b29sX3BhdGgiICIkTE9DQUwiICIkUkVNT1RFIiBcCisJCQkJCS0tZGVmYXVs dCAtLW1vZGU9bWVyZ2UyIC0tdG89IiRNRVJHRUQiCiAJCQlmaQogCQkJY2hlY2tfdW5jaGFu Z2VkCiAJCWVsc2UKLQkJCSIkbWVyZ2VfdG9vbF9wYXRoIiAtZiAtZCAtYyAid2luY21kIGwi IFwKKwkJCSIkbWVyZ2VfdG9vbF9wYXRoIiAtLWRlZmF1bHQgLS1tb2RlPWRpZmYyIFwKIAkJ CQkiJExPQ0FMIiAiJFJFTU9URSIKIAkJZmkKIAkJOzsKLQl2aW1kaWZmMnxndmltZGlmZjIp CisJZW1lcmdlKQorCQlpZiBtZXJnZV9tb2RlOyB0aGVuCisJCQlpZiAkYmFzZV9wcmVzZW50 OyB0aGVuCisJCQkJIiRtZXJnZV90b29sX3BhdGgiIFwKKwkJCQkJLWYgZW1lcmdlLWZpbGVz LXdpdGgtYW5jZXN0b3ItY29tbWFuZCBcCisJCQkJCSIkTE9DQUwiICIkUkVNT1RFIiAiJEJB U0UiIFwKKwkJCQkJIiQoYmFzZW5hbWUgIiRNRVJHRUQiKSIKKwkJCWVsc2UKKwkJCQkiJG1l cmdlX3Rvb2xfcGF0aCIgXAorCQkJCQktZiBlbWVyZ2UtZmlsZXMtY29tbWFuZCBcCisJCQkJ CSIkTE9DQUwiICIkUkVNT1RFIiBcCisJCQkJCSIkKGJhc2VuYW1lICIkTUVSR0VEIikiCisJ CQlmaQorCQkJc3RhdHVzPSQ/CisJCWVsc2UKKwkJCSIkbWVyZ2VfdG9vbF9wYXRoIiAtZiBl bWVyZ2UtZmlsZXMtY29tbWFuZCBcCisJCQkJIiRMT0NBTCIgIiRSRU1PVEUiCisJCWZpCisJ CTs7CisJZ3ZpbWRpZmZ8dmltZGlmZikNCisJCWlmIG1lcmdlX21vZGU7IHRoZW4NCisJCQl0 b3VjaCAiJEJBQ0tVUCINCisJCQlpZiAkYmFzZV9wcmVzZW50OyB0aGVuDQorCQkJCSIkbWVy Z2VfdG9vbF9wYXRoIiAtZiAtZCAtYyAid2luY21kIEoiIFwNCisJCQkJCSIkTUVSR0VEIiAi JExPQ0FMIiAiJEJBU0UiICIkUkVNT1RFIg0KKwkJCWVsc2UNCisJCQkJIiRtZXJnZV90b29s X3BhdGgiIC1mIC1kIC1jICJ3aW5jbWQgbCIgXA0KKwkJCQkJIiRMT0NBTCIgIiRNRVJHRUQi ICIkUkVNT1RFIg0KKwkJCWZpDQorCQkJY2hlY2tfdW5jaGFuZ2VkDQorCQllbHNlDQorCQkJ IiRtZXJnZV90b29sX3BhdGgiIC1mIC1kIC1jICJ3aW5jbWQgbCIgXA0KKwkJCQkiJExPQ0FM IiAiJFJFTU9URSINCisJCWZpDQorCQk7Ow0KKwlndmltZGlmZjJ8dmltZGlmZjIpCiAJCWlm IG1lcmdlX21vZGU7IHRoZW4KIAkJCXRvdWNoICIkQkFDS1VQIgogCQkJIiRtZXJnZV90b29s X3BhdGgiIC1mIC1kIC1jICJ3aW5jbWQgbCIgXApAQCAtMTk3LDMwICsxODQsNDIgQEAgcnVu X21lcmdlX3Rvb2wgKCkgewogCQkJCSIkTE9DQUwiICIkUkVNT1RFIgogCQlmaQogCQk7Owot CXh4ZGlmZikKKwlrZGlmZjMpCiAJCWlmIG1lcmdlX21vZGU7IHRoZW4KLQkJCXRvdWNoICIk QkFDS1VQIgogCQkJaWYgJGJhc2VfcHJlc2VudDsgdGhlbgotCQkJCSIkbWVyZ2VfdG9vbF9w YXRoIiAtWCAtLXNob3ctbWVyZ2VkLXBhbmUgXAotCQkJCQktUiAnQWNjZWwuU2F2ZUFzTWVy Z2VkOiAiQ3RybC1TIicgXAotCQkJCQktUiAnQWNjZWwuU2VhcmNoOiAiQ3RybCtGIicgXAot CQkJCQktUiAnQWNjZWwuU2VhcmNoRm9yd2FyZDogIkN0cmwtRyInIFwKLQkJCQkJLS1tZXJn ZWQtZmlsZSAiJE1FUkdFRCIgXAotCQkJCQkiJExPQ0FMIiAiJEJBU0UiICIkUkVNT1RFIgor CQkJCSgiJG1lcmdlX3Rvb2xfcGF0aCIgLS1hdXRvIFwKKwkJCQkJLS1MMSAiJE1FUkdFRCAo QmFzZSkiIFwKKwkJCQkJLS1MMiAiJE1FUkdFRCAoTG9jYWwpIiBcCisJCQkJCS0tTDMgIiRN RVJHRUQgKFJlbW90ZSkiIFwKKwkJCQkJLW8gIiRNRVJHRUQiIFwKKwkJCQkJIiRCQVNFIiAi JExPQ0FMIiAiJFJFTU9URSIgXAorCQkJCT4gL2Rldi9udWxsIDI+JjEpCiAJCQllbHNlCi0J CQkJIiRtZXJnZV90b29sX3BhdGgiIC1YICRleHRyYSBcCi0JCQkJCS1SICdBY2NlbC5TYXZl QXNNZXJnZWQ6ICJDdHJsLVMiJyBcCi0JCQkJCS1SICdBY2NlbC5TZWFyY2g6ICJDdHJsK0Yi JyBcCi0JCQkJCS1SICdBY2NlbC5TZWFyY2hGb3J3YXJkOiAiQ3RybC1HIicgXAotCQkJCQkt LW1lcmdlZC1maWxlICIkTUVSR0VEIiBcCi0JCQkJCSIkTE9DQUwiICIkUkVNT1RFIgorCQkJ CSgiJG1lcmdlX3Rvb2xfcGF0aCIgLS1hdXRvIFwKKwkJCQkJLS1MMSAiJE1FUkdFRCAoTG9j YWwpIiBcCisJCQkJCS0tTDIgIiRNRVJHRUQgKFJlbW90ZSkiIFwKKwkJCQkJLW8gIiRNRVJH RUQiIFwKKwkJCQkJIiRMT0NBTCIgIiRSRU1PVEUiIFwKKwkJCQk+IC9kZXYvbnVsbCAyPiYx KQogCQkJZmkKKwkJCXN0YXR1cz0kPworCQllbHNlCisJCQkoIiRtZXJnZV90b29sX3BhdGgi IC0tYXV0byBcCisJCQkJLS1MMSAiJE1FUkdFRCAoQSkiIFwKKwkJCQktLUwyICIkTUVSR0VE IChCKSIgIiRMT0NBTCIgIiRSRU1PVEUiIFwKKwkJCT4gL2Rldi9udWxsIDI+JjEpCisJCWZp CisJCTs7CisJa29tcGFyZSkKKwkJIiRtZXJnZV90b29sX3BhdGgiICIkTE9DQUwiICIkUkVN T1RFIgorCQk7OworCW1lbGQpCisJCWlmIG1lcmdlX21vZGU7IHRoZW4KKwkJCXRvdWNoICIk QkFDS1VQIgorCQkJIiRtZXJnZV90b29sX3BhdGgiICIkTE9DQUwiICIkTUVSR0VEIiAiJFJF TU9URSIKIAkJCWNoZWNrX3VuY2hhbmdlZAogCQllbHNlCi0JCQkiJG1lcmdlX3Rvb2xfcGF0 aCIgXAotCQkJCS1SICdBY2NlbC5TZWFyY2g6ICJDdHJsK0YiJyBcCi0JCQkJLVIgJ0FjY2Vs LlNlYXJjaEZvcndhcmQ6ICJDdHJsLUciJyBcCi0JCQkJIiRMT0NBTCIgIiRSRU1PVEUiCisJ CQkiJG1lcmdlX3Rvb2xfcGF0aCIgIiRMT0NBTCIgIiRSRU1PVEUiCiAJCWZpCiAJCTs7CiAJ b3BlbmRpZmYpCkBAIC0yMzksMzkgKzIzOCwzMSBAQCBydW5fbWVyZ2VfdG9vbCAoKSB7CiAJ CQkiJG1lcmdlX3Rvb2xfcGF0aCIgIiRMT0NBTCIgIiRSRU1PVEUiIHwgY2F0CiAJCWZpCiAJ CTs7Ci0JZWNtZXJnZSkKKwlwNG1lcmdlKQogCQlpZiBtZXJnZV9tb2RlOyB0aGVuCi0JCQl0 b3VjaCAiJEJBQ0tVUCIKKwkJICAgIHRvdWNoICIkQkFDS1VQIgogCQkJaWYgJGJhc2VfcHJl c2VudDsgdGhlbgotCQkJCSIkbWVyZ2VfdG9vbF9wYXRoIiAiJEJBU0UiICIkTE9DQUwiICIk UkVNT1RFIiBcCi0JCQkJCS0tZGVmYXVsdCAtLW1vZGU9bWVyZ2UzIC0tdG89IiRNRVJHRUQi CisJCQkJIiRtZXJnZV90b29sX3BhdGgiICIkQkFTRSIgIiRMT0NBTCIgIiRSRU1PVEUiICIk TUVSR0VEIgogCQkJZWxzZQotCQkJCSIkbWVyZ2VfdG9vbF9wYXRoIiAiJExPQ0FMIiAiJFJF TU9URSIgXAotCQkJCQktLWRlZmF1bHQgLS1tb2RlPW1lcmdlMiAtLXRvPSIkTUVSR0VEIgor CQkJCSIkbWVyZ2VfdG9vbF9wYXRoIiAiJExPQ0FMIiAiJExPQ0FMIiAiJFJFTU9URSIgIiRN RVJHRUQiCiAJCQlmaQogCQkJY2hlY2tfdW5jaGFuZ2VkCiAJCWVsc2UKLQkJCSIkbWVyZ2Vf dG9vbF9wYXRoIiAtLWRlZmF1bHQgLS1tb2RlPWRpZmYyIFwKLQkJCQkiJExPQ0FMIiAiJFJF TU9URSIKKwkJCSIkbWVyZ2VfdG9vbF9wYXRoIiAiJExPQ0FMIiAiJFJFTU9URSIKIAkJZmkK IAkJOzsKLQllbWVyZ2UpCisJdGtkaWZmKQogCQlpZiBtZXJnZV9tb2RlOyB0aGVuCiAJCQlp ZiAkYmFzZV9wcmVzZW50OyB0aGVuCi0JCQkJIiRtZXJnZV90b29sX3BhdGgiIFwKLQkJCQkJ LWYgZW1lcmdlLWZpbGVzLXdpdGgtYW5jZXN0b3ItY29tbWFuZCBcCi0JCQkJCSIkTE9DQUwi ICIkUkVNT1RFIiAiJEJBU0UiIFwKLQkJCQkJIiQoYmFzZW5hbWUgIiRNRVJHRUQiKSIKKwkJ CQkiJG1lcmdlX3Rvb2xfcGF0aCIgLWEgIiRCQVNFIiBcCisJCQkJCS1vICIkTUVSR0VEIiAi JExPQ0FMIiAiJFJFTU9URSIKIAkJCWVsc2UKIAkJCQkiJG1lcmdlX3Rvb2xfcGF0aCIgXAot CQkJCQktZiBlbWVyZ2UtZmlsZXMtY29tbWFuZCBcCi0JCQkJCSIkTE9DQUwiICIkUkVNT1RF IiBcCi0JCQkJCSIkKGJhc2VuYW1lICIkTUVSR0VEIikiCisJCQkJCS1vICIkTUVSR0VEIiAi JExPQ0FMIiAiJFJFTU9URSIKIAkJCWZpCiAJCQlzdGF0dXM9JD8KIAkJZWxzZQotCQkJIiRt ZXJnZV90b29sX3BhdGgiIC1mIGVtZXJnZS1maWxlcy1jb21tYW5kIFwKLQkJCQkiJExPQ0FM IiAiJFJFTU9URSIKKwkJCSIkbWVyZ2VfdG9vbF9wYXRoIiAiJExPQ0FMIiAiJFJFTU9URSIK IAkJZmkKIAkJOzsKIAl0b3J0b2lzZW1lcmdlKQpAQCAtMjg2LDIyICsyNzcsMzAgQEAgcnVu X21lcmdlX3Rvb2wgKCkgewogCQkJc3RhdHVzPTEKIAkJZmkKIAkJOzsKLQlhcmF4aXMpCisJ eHhkaWZmKQogCQlpZiBtZXJnZV9tb2RlOyB0aGVuCiAJCQl0b3VjaCAiJEJBQ0tVUCIKIAkJ CWlmICRiYXNlX3ByZXNlbnQ7IHRoZW4KLQkJCQkiJG1lcmdlX3Rvb2xfcGF0aCIgLXdhaXQg LW1lcmdlIC0zIC1hMSBcCi0JCQkJCSIkQkFTRSIgIiRMT0NBTCIgIiRSRU1PVEUiICIkTUVS R0VEIiBcCi0JCQkJCT4vZGV2L251bGwgMj4mMQorCQkJCSIkbWVyZ2VfdG9vbF9wYXRoIiAt WCAtLXNob3ctbWVyZ2VkLXBhbmUgXAorCQkJCQktUiAnQWNjZWwuU2F2ZUFzTWVyZ2VkOiAi Q3RybC1TIicgXAorCQkJCQktUiAnQWNjZWwuU2VhcmNoOiAiQ3RybCtGIicgXAorCQkJCQkt UiAnQWNjZWwuU2VhcmNoRm9yd2FyZDogIkN0cmwtRyInIFwKKwkJCQkJLS1tZXJnZWQtZmls ZSAiJE1FUkdFRCIgXAorCQkJCQkiJExPQ0FMIiAiJEJBU0UiICIkUkVNT1RFIgogCQkJZWxz ZQotCQkJCSIkbWVyZ2VfdG9vbF9wYXRoIiAtd2FpdCAtMiBcCi0JCQkJCSIkTE9DQUwiICIk UkVNT1RFIiAiJE1FUkdFRCIgXAotCQkJCQk+L2Rldi9udWxsIDI+JjEKKwkJCQkiJG1lcmdl X3Rvb2xfcGF0aCIgLVggJGV4dHJhIFwKKwkJCQkJLVIgJ0FjY2VsLlNhdmVBc01lcmdlZDog IkN0cmwtUyInIFwKKwkJCQkJLVIgJ0FjY2VsLlNlYXJjaDogIkN0cmwrRiInIFwKKwkJCQkJ LVIgJ0FjY2VsLlNlYXJjaEZvcndhcmQ6ICJDdHJsLUciJyBcCisJCQkJCS0tbWVyZ2VkLWZp bGUgIiRNRVJHRUQiIFwKKwkJCQkJIiRMT0NBTCIgIiRSRU1PVEUiCiAJCQlmaQogCQkJY2hl Y2tfdW5jaGFuZ2VkCiAJCWVsc2UKLQkJCSIkbWVyZ2VfdG9vbF9wYXRoIiAtd2FpdCAtMiAi JExPQ0FMIiAiJFJFTU9URSIgXAotCQkJCT4vZGV2L251bGwgMj4mMQorCQkJIiRtZXJnZV90 b29sX3BhdGgiIFwKKwkJCQktUiAnQWNjZWwuU2VhcmNoOiAiQ3RybCtGIicgXAorCQkJCS1S ICdBY2NlbC5TZWFyY2hGb3J3YXJkOiAiQ3RybC1HIicgXAorCQkJCSIkTE9DQUwiICIkUkVN T1RFIgogCQlmaQogCQk7OwogCSopCi0tIAoxLjcuMy4yLm1zeXNnaXQuNi5kaXJ0eQoK --------------080106030706020608070108 Content-Type: text/plain; name="0002-mergetool-lib-Add-Beyond-Compare-3-as-a-tool.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0002-mergetool-lib-Add-Beyond-Compare-3-as-a-tool.patch" RnJvbSBlZjFmYTAzMTgwYzc4YWMyZjcxMTliMGI3OWZkZGFhMzcxOTVhNDhkIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBTZWJhc3RpYW4gU2NodWJlcnRoIDxzc2NodWJlcnRo QGdtYWlsLmNvbT4KRGF0ZTogVGh1LCAxOCBOb3YgMjAxMCAxMTowNTowMSArMDEwMApTdWJq ZWN0OiBbUEFUQ0ggMi8zXSBtZXJnZXRvb2wtLWxpYjogQWRkIEJleW9uZCBDb21wYXJlIDMg YXMgYSB0b29sCgoKU2lnbmVkLW9mZi1ieTogU2ViYXN0aWFuIFNjaHViZXJ0aCA8c3NjaHVi ZXJ0aEBnbWFpbC5jb20+Ci0tLQogRG9jdW1lbnRhdGlvbi9naXQtZGlmZnRvb2wudHh0ICAg ICAgICAgfCAgICAyICstCiBEb2N1bWVudGF0aW9uL2dpdC1tZXJnZXRvb2wudHh0ICAgICAg ICB8ICAgIDIgKy0KIERvY3VtZW50YXRpb24vbWVyZ2UtY29uZmlnLnR4dCAgICAgICAgIHwg ICAgMiArLQogY29udHJpYi9jb21wbGV0aW9uL2dpdC1jb21wbGV0aW9uLmJhc2ggfCAgICAy ICstCiBnaXQtZ3VpL2xpYi9tZXJnZXRvb2wudGNsICAgICAgICAgICAgICB8ICAgIDcgKysr KysrKwogZ2l0LW1lcmdldG9vbC0tbGliLnNoICAgICAgICAgICAgICAgICAgfCAgIDIyICsr KysrKysrKysrKysrKysrKysrLS0KIDYgZmlsZXMgY2hhbmdlZCwgMzEgaW5zZXJ0aW9ucygr KSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL2dpdC1kaWZm dG9vbC50eHQgYi9Eb2N1bWVudGF0aW9uL2dpdC1kaWZmdG9vbC50eHQKaW5kZXggNGM4ODI1 ZC4uZjA4N2VmZiAxMDA2NDQKLS0tIGEvRG9jdW1lbnRhdGlvbi9naXQtZGlmZnRvb2wudHh0 CisrKyBiL0RvY3VtZW50YXRpb24vZ2l0LWRpZmZ0b29sLnR4dApAQCAtMzEsNyArMzEsNyBA QCBPUFRJT05TCiAtLXRvb2w9PHRvb2w+OjoKIAlVc2UgdGhlIGRpZmYgdG9vbCBzcGVjaWZp ZWQgYnkgPHRvb2w+LgogCVZhbGlkIG1lcmdlIHRvb2xzIGFyZToKLQlhcmF4aXMsIGRpZmZ1 c2UsIGVtZXJnZSwgZWNtZXJnZSwgZ3ZpbWRpZmYsIGtkaWZmMywKKwlhcmF4aXMsIGJjMywg ZGlmZnVzZSwgZW1lcmdlLCBlY21lcmdlLCBndmltZGlmZiwga2RpZmYzLAogCWtvbXBhcmUs IG1lbGQsIG9wZW5kaWZmLCBwNG1lcmdlLCB0a2RpZmYsIHZpbWRpZmYgYW5kIHh4ZGlmZi4K ICsKIElmIGEgZGlmZiB0b29sIGlzIG5vdCBzcGVjaWZpZWQsICdnaXQgZGlmZnRvb2wnCmRp ZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL2dpdC1tZXJnZXRvb2wudHh0IGIvRG9jdW1lbnRh dGlvbi9naXQtbWVyZ2V0b29sLnR4dAppbmRleCA0OTg3MjQ1Li43NDBiM2YxIDEwMDY0NAot LS0gYS9Eb2N1bWVudGF0aW9uL2dpdC1tZXJnZXRvb2wudHh0CisrKyBiL0RvY3VtZW50YXRp b24vZ2l0LW1lcmdldG9vbC50eHQKQEAgLTI2LDcgKzI2LDcgQEAgT1BUSU9OUwogLS10b29s PTx0b29sPjo6CiAJVXNlIHRoZSBtZXJnZSByZXNvbHV0aW9uIHByb2dyYW0gc3BlY2lmaWVk IGJ5IDx0b29sPi4KIAlWYWxpZCBtZXJnZSB0b29scyBhcmU6Ci0JYXJheGlzLCBkaWZmdXNl LCBlY21lcmdlLCBlbWVyZ2UsIGd2aW1kaWZmLCBrZGlmZjMsCisJYXJheGlzLCBiYzMsIGRp ZmZ1c2UsIGVjbWVyZ2UsIGVtZXJnZSwgZ3ZpbWRpZmYsIGtkaWZmMywKIAltZWxkLCBvcGVu ZGlmZiwgcDRtZXJnZSwgdGtkaWZmLCB0b3J0b2lzZW1lcmdlLCB2aW1kaWZmIGFuZCB4eGRp ZmYuCiArCiBJZiBhIG1lcmdlIHJlc29sdXRpb24gcHJvZ3JhbSBpcyBub3Qgc3BlY2lmaWVk LCAnZ2l0IG1lcmdldG9vbCcKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vbWVyZ2UtY29u ZmlnLnR4dCBiL0RvY3VtZW50YXRpb24vbWVyZ2UtY29uZmlnLnR4dAppbmRleCA5MDU4N2Ri Li4zM2JmNzRjIDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL21lcmdlLWNvbmZpZy50eHQK KysrIGIvRG9jdW1lbnRhdGlvbi9tZXJnZS1jb25maWcudHh0CkBAIC0zNCw3ICszNCw3IEBA IG1lcmdlLnN0YXQ6OgogbWVyZ2UudG9vbDo6CiAJQ29udHJvbHMgd2hpY2ggbWVyZ2UgcmVz b2x1dGlvbiBwcm9ncmFtIGlzIHVzZWQgYnkKIAlsaW5rZ2l0OmdpdC1tZXJnZXRvb2xbMV0u ICBWYWxpZCBidWlsdC1pbiB2YWx1ZXMgYXJlOiAiYXJheGlzIiwKLQkiZGlmZnVzZSIsICJl Y21lcmdlIiwgImVtZXJnZSIsICJndmltZGlmZiIsICJrZGlmZjMiLCAibWVsZCIsCisJImJj MyIsICJkaWZmdXNlIiwgImVjbWVyZ2UiLCAiZW1lcmdlIiwgImd2aW1kaWZmIiwgImtkaWZm MyIsICJtZWxkIiwKIAkib3BlbmRpZmYiLCAicDRtZXJnZSIsICJ0a2RpZmYiLCAidG9ydG9p c2VtZXJnZSIsICJ2aW1kaWZmIgogCWFuZCAieHhkaWZmIi4gIEFueSBvdGhlciB2YWx1ZSBp cyB0cmVhdGVkIGlzIGN1c3RvbSBtZXJnZSB0b29sCiAJYW5kIHRoZXJlIG11c3QgYmUgYSBj b3JyZXNwb25kaW5nIG1lcmdldG9vbC48dG9vbD4uY21kIG9wdGlvbi4KZGlmZiAtLWdpdCBh L2NvbnRyaWIvY29tcGxldGlvbi9naXQtY29tcGxldGlvbi5iYXNoIGIvY29udHJpYi9jb21w bGV0aW9uL2dpdC1jb21wbGV0aW9uLmJhc2gKaW5kZXggODkzYjc3MS4uMDU4YzJhOSAxMDA3 NTUKLS0tIGEvY29udHJpYi9jb21wbGV0aW9uL2dpdC1jb21wbGV0aW9uLmJhc2gKKysrIGIv Y29udHJpYi9jb21wbGV0aW9uL2dpdC1jb21wbGV0aW9uLmJhc2gKQEAgLTEzNTgsNyArMTM1 OCw3IEBAIF9naXRfZGlmZiAoKQogfQogCiBfX2dpdF9tZXJnZXRvb2xzX2NvbW1vbj0iZGlm ZnVzZSBlY21lcmdlIGVtZXJnZSBrZGlmZjMgbWVsZCBvcGVuZGlmZgotCQkJdGtkaWZmIHZp bWRpZmYgZ3ZpbWRpZmYgeHhkaWZmIGFyYXhpcyBwNG1lcmdlCisJCQl0a2RpZmYgdmltZGlm ZiBndmltZGlmZiB4eGRpZmYgYXJheGlzIHA0bWVyZ2UgYmMzCiAiCiAKIF9naXRfZGlmZnRv b2wgKCkKZGlmZiAtLWdpdCBhL2dpdC1ndWkvbGliL21lcmdldG9vbC50Y2wgYi9naXQtZ3Vp L2xpYi9tZXJnZXRvb2wudGNsCmluZGV4IDI0OWUwY2YuLjNjOGU3M2IgMTAwNjQ0Ci0tLSBh L2dpdC1ndWkvbGliL21lcmdldG9vbC50Y2wKKysrIGIvZ2l0LWd1aS9saWIvbWVyZ2V0b29s LnRjbApAQCAtMTg3LDYgKzE4NywxMyBAQCBwcm9jIG1lcmdlX3Jlc29sdmVfdG9vbDIge30g ewogCQkJCSAiJExPQ0FMIiAiJFJFTU9URSIgIiRNRVJHRUQiXQogCQl9CiAJfQorCWJjMyB7 CisJCWlmIHskYmFzZV9zdGFnZSBuZSB7fX0geworCQkJc2V0IGNtZGxpbmUgW2xpc3QgIiRt ZXJnZV90b29sX3BhdGgiICIkTE9DQUwiICIkUkVNT1RFIiAiJEJBU0UiIC1tZXJnZW91dHB1 dD0iJE1FUkdFRCJdCisJCX0gZWxzZSB7CisJCQlzZXQgY21kbGluZSBbbGlzdCAiJG1lcmdl X3Rvb2xfcGF0aCIgIiRMT0NBTCIgIiRSRU1PVEUiIC1tZXJnZW91dHB1dD0iJE1FUkdFRCJd CisJCX0KKwl9CiAJZWNtZXJnZSB7CiAJCWlmIHskYmFzZV9zdGFnZSBuZSB7fX0gewogCQkJ c2V0IGNtZGxpbmUgW2xpc3QgIiRtZXJnZV90b29sX3BhdGgiICIkQkFTRSIgIiRMT0NBTCIg IiRSRU1PVEUiIC0tZGVmYXVsdCAtLW1vZGU9bWVyZ2UzIC0tdG89IiRNRVJHRUQiXQpkaWZm IC0tZ2l0IGEvZ2l0LW1lcmdldG9vbC0tbGliLnNoIGIvZ2l0LW1lcmdldG9vbC0tbGliLnNo CmluZGV4IDlmYjgyZTUuLjNhYzYyMzEgMTAwNjQ0Ci0tLSBhL2dpdC1tZXJnZXRvb2wtLWxp Yi5zaAorKysgYi9naXQtbWVyZ2V0b29sLS1saWIuc2gKQEAgLTEzLDYgKzEzLDkgQEAgdHJh bnNsYXRlX21lcmdlX3Rvb2xfcGF0aCAoKSB7CiAJYXJheGlzKQogCQllY2hvIGNvbXBhcmUK IAkJOzsKKwliYzMpCisJCWVjaG8gQkNvbXBhcmUKKwkJOzsKIAllbWVyZ2UpCiAJCWVjaG8g ZW1hY3MKIAkJOzsKQEAgLTQ2LDcgKzQ5LDcgQEAgY2hlY2tfdW5jaGFuZ2VkICgpIHsKIAog dmFsaWRfdG9vbCAoKSB7CiAJY2FzZSAiJDEiIGluCi0JYXJheGlzIHwgZGlmZnVzZSB8IGVj bWVyZ2UgfCBlbWVyZ2UgfCBndmltZGlmZiB8IGd2aW1kaWZmMiB8IFwKKwlhcmF4aXMgfCBi YzMgfCBkaWZmdXNlIHwgZWNtZXJnZSB8IGVtZXJnZSB8IGd2aW1kaWZmIHwgZ3ZpbWRpZmYy IHwgXAogCWtkaWZmMyB8IG1lbGQgfCBvcGVuZGlmZiB8IHA0bWVyZ2UgfCB0a2RpZmYgfCB2 aW1kaWZmIHwgdmltZGlmZjIgfCB4eGRpZmYpCiAJCTs7ICMgaGFwcHkKIAlrb21wYXJlKQpA QCAtMTA2LDYgKzEwOSwyMSBAQCBydW5fbWVyZ2VfdG9vbCAoKSB7CiAJCQkJPi9kZXYvbnVs bCAyPiYxCiAJCWZpCiAJCTs7CisJYmMzKQorCQlpZiBtZXJnZV9tb2RlOyB0aGVuCisJCQl0 b3VjaCAiJEJBQ0tVUCIKKwkJCWlmICRiYXNlX3ByZXNlbnQ7IHRoZW4KKwkJCQkiJG1lcmdl X3Rvb2xfcGF0aCIgIiRMT0NBTCIgIiRSRU1PVEUiICIkQkFTRSIgXAorCQkJCQktbWVyZ2Vv dXRwdXQ9IiRNRVJHRUQiCisJCQllbHNlCisJCQkJIiRtZXJnZV90b29sX3BhdGgiICIkTE9D QUwiICIkUkVNT1RFIiBcCisJCQkJCS1tZXJnZW91dHB1dD0iJE1FUkdFRCIKKwkJCWZpCisJ CQljaGVja191bmNoYW5nZWQKKwkJZWxzZQorCQkJIiRtZXJnZV90b29sX3BhdGgiICIkTE9D QUwiICIkUkVNT1RFIgorCQlmaQorCQk7OwogCWRpZmZ1c2UpCiAJCWlmIG1lcmdlX21vZGU7 IHRoZW4KIAkJCXRvdWNoICIkQkFDS1VQIgpAQCAtMzQyLDcgKzM2MCw3IEBAIGd1ZXNzX21l cmdlX3Rvb2wgKCkgewogCQllbHNlCiAJCQl0b29scz0ib3BlbmRpZmYga2RpZmYzIHRrZGlm ZiB4eGRpZmYgbWVsZCAkdG9vbHMiCiAJCWZpCi0JCXRvb2xzPSIkdG9vbHMgZ3ZpbWRpZmYg ZGlmZnVzZSBlY21lcmdlIHA0bWVyZ2UgYXJheGlzIgorCQl0b29scz0iJHRvb2xzIGd2aW1k aWZmIGRpZmZ1c2UgZWNtZXJnZSBwNG1lcmdlIGFyYXhpcyBiYzMiCiAJZmkKIAljYXNlICIk e1ZJU1VBTDotJEVESVRPUn0iIGluCiAJKnZpbSopCi0tIAoxLjcuMy4yLm1zeXNnaXQuNi5k aXJ0eQoK --------------080106030706020608070108 Content-Type: text/plain; name="0003-mergetool-lib-Add-the-proper-executable-name-for-ECM.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0003-mergetool-lib-Add-the-proper-executable-name-for-ECM.pa"; filename*1="tch" RnJvbSA4ZTg3MWRhYjczZjM3NTk0OTZjZTVmMGI4N2ZjZmNhNjg5YjBjNGFlIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBTZWJhc3RpYW4gU2NodWJlcnRoIDxzc2NodWJlcnRo QGdtYWlsLmNvbT4KRGF0ZTogVGh1LCAxOCBOb3YgMjAxMCAxMTowNjoxMyArMDEwMApTdWJq ZWN0OiBbUEFUQ0ggMy8zXSBtZXJnZXRvb2wtLWxpYjogQWRkIHRoZSBwcm9wZXIgZXhlY3V0 YWJsZSBuYW1lIGZvciBFQ01lcmdlCgoKU2lnbmVkLW9mZi1ieTogU2ViYXN0aWFuIFNjaHVi ZXJ0aCA8c3NjaHViZXJ0aEBnbWFpbC5jb20+Ci0tLQogZ2l0LW1lcmdldG9vbC0tbGliLnNo IHwgICAgMyArKysKIDEgZmlsZXMgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCspLCAwIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dpdC1tZXJnZXRvb2wtLWxpYi5zaCBiL2dpdC1tZXJn ZXRvb2wtLWxpYi5zaAppbmRleCAzYWM2MjMxLi45NWRhMDBiIDEwMDY0NAotLS0gYS9naXQt bWVyZ2V0b29sLS1saWIuc2gKKysrIGIvZ2l0LW1lcmdldG9vbC0tbGliLnNoCkBAIC0xNiw2 ICsxNiw5IEBAIHRyYW5zbGF0ZV9tZXJnZV90b29sX3BhdGggKCkgewogCWJjMykKIAkJZWNo byBCQ29tcGFyZQogCQk7OworCWVjbWVyZ2UpCisJCWVjaG8gZ3VpbWVyZ2UKKwkJOzsKIAll bWVyZ2UpCiAJCWVjaG8gZW1hY3MKIAkJOzsKLS0gCjEuNy4zLjIubXN5c2dpdC42LmRpcnR5 Cgo= --------------080106030706020608070108--