From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Michael Heerdegen Newsgroups: gmane.emacs.help Subject: Re: How to use emacs as a "diff3 -m" compatible merge tool? Date: Fri, 10 Jun 2022 20:50:57 +0200 Message-ID: <8735gcmjxq.fsf@web.de> References: <87ilpaay1j.fsf@gnu.org> <87mtelpq9t.fsf@web.de> <875yl8qx6t.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="23788"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) Cc: help-gnu-emacs@gnu.org To: Tassilo Horn Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jun 10 20:51:52 2022 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nzjjb-00060m-R2 for geh-help-gnu-emacs@m.gmane-mx.org; Fri, 10 Jun 2022 20:51:51 +0200 Original-Received: from localhost ([::1]:36578 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nzjja-0000tI-9B for geh-help-gnu-emacs@m.gmane-mx.org; Fri, 10 Jun 2022 14:51:50 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:43934) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nzjit-0000rH-Nr for help-gnu-emacs@gnu.org; Fri, 10 Jun 2022 14:51:08 -0400 Original-Received: from mout.web.de ([212.227.17.12]:37127) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nzjio-0008Ci-QC; Fri, 10 Jun 2022 14:51:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1654887058; bh=xgCKpxCGCURfAitg66nrj3xL5ct23bwYon91EL6/Mlw=; h=X-UI-Sender-Class:From:To:Cc:Subject:References:Date:In-Reply-To; b=Kn+ejecWsBqONpaSvsMUZ9boDZiEyAL6fjgH5tF6VYlnlqf1gmYtJNn7olt7fNsRU I3/Kah6uKtbfzs3fGPxLZKkc7KU+2P6+SrdYX+feZKz/TRcLfSQ4NVXj6Jf/GYpDCU fVmUCw4VEFvojrpLlvljaw+mnlOMnTTH5+IOEHLA= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Original-Received: from drachen.dragon ([84.60.174.246]) by smtp.web.de (mrweb106 [213.165.67.124]) with ESMTPSA (Nemesis) id 1Ml4B4-1nKwrm14RQ-00lTAK; Fri, 10 Jun 2022 20:50:58 +0200 In-Reply-To: <875yl8qx6t.fsf@gnu.org> (Tassilo Horn's message of "Fri, 10 Jun 2022 18:42:42 +0200") X-Provags-ID: V03:K1:RoFub0fEaE6qnDkXypTTCuftJlstx/Lj26+s4VsHgYf5iPOBG/d vIHJV/ycRM4BbPjpi9wjjRks843XiuvL/H909/wV0TOwvzEbm6ovvNgTsovCUVwK3q+6+Bd iw2DXsYRXTq5K1U7r1VbTrKnc2BAQW9fatSGZo5/duaMQCnx35iww/ANwei5jkzziH97Ljp rijYE+vna1T7wooGBmABg== X-UI-Out-Filterresults: notjunk:1;V03:K0:ynBtwABVO/s=:1hUUzWYKXSN28hK7Gq7w0y PPDo2kUMufw/usl1eLX/HUY57Hd3qiWB/58JmD62VTgvW1zlKwDjsQbMBFD0504rWAfkJ8MAK QTTM+V117qS+bnFBqvrsTEeI2Sk498vt+ZPKJhtlDs716X7aSc0ipMZjx61dLztJ4TmawO1rO 6OnEZBnedoIvfayftl2gmEVZKKJdO8QjStxzRCjFTLKtlJJSV4N9EKXVSH5/9nwvVjHJ7Ub7z bhd/nIUeP8EEknuvRsJ8DmbCqiKil0frXCvRsOpE2TCNEvw+kc6lCmOiOlV/pIlhmyNVEyf4D OJHfJm3YbKKknZVmQWOvSWaeug6qnLnuggUwWya7LKaktnEzzzp55d1N/0yfzUAXHndYvl6sF 4sBkRaCz6W6jjbnkSbF55QVxxdTWEO2E8ROmnW0fkpg3WB/9ToHLJkCzprTZGERuGIp1URFeS 6dRoj3mP6pvXR2tGveL2uZ0w6eVjB9hbT0KTRCM+8G98bRyKs2aN+x19zSnSiMlMIfQmCu0Jt gsKfUUUcaypIu/Yu9uhp/QU65uLrjfAPsxNpGcfnnolQRUClzpoogoVvMMQz1zj00Is+JP3uK yd/GKcDCLvILCjH2Rk45fP4DXqArVdkjD8dVjpp2P+nnMk58JSskFKOg9yww/y+nL3ZnOn6/g 283NHYhG+iAi7v7tGC49qVVCS/ACzs3Xwh1y6vMX68H6RruIK6uLmqwlearo0Rh5vnJ7uzzy2 atY0YZT2FdThZjCUF9JkpdmDJyizutQZJQN2SezpTP/0P2GBzzeK8I+dmzIA+NEI8sMlyEZT Received-SPF: pass client-ip=212.227.17.12; envelope-from=michael_heerdegen@web.de; helo=mout.web.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "help-gnu-emacs" Xref: news.gmane.io gmane.emacs.help:137626 Archived-At: Tassilo Horn writes: > Thanks, I will have a look. Do I understand it correctly that your > answer is specifically about the emacsclient case? Yes. > But how do I print buffer contents to emacs' stdout? I don't know. Michael.