From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Sergey Organov Newsgroups: gmane.emacs.help Subject: Looking for a helper for advanced conflicts resolution. Date: Fri, 24 Jul 2020 14:07:06 +0300 Message-ID: <878sf9tbmt.fsf@osv.gnss.ru> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="30866"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) To: help-gnu-emacs@gnu.org Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jul 24 13:07:32 2020 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 1jyvY4-0007w0-5X for geh-help-gnu-emacs@m.gmane-mx.org; Fri, 24 Jul 2020 13:07:32 +0200 Original-Received: from localhost ([::1]:40938 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jyvY3-0003Bn-84 for geh-help-gnu-emacs@m.gmane-mx.org; Fri, 24 Jul 2020 07:07:31 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:58662) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jyvXl-0003Bf-9V for help-gnu-emacs@gnu.org; Fri, 24 Jul 2020 07:07:13 -0400 Original-Received: from mail-lj1-x22f.google.com ([2a00:1450:4864:20::22f]:36169) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jyvXj-0006G3-9I for help-gnu-emacs@gnu.org; Fri, 24 Jul 2020 07:07:12 -0400 Original-Received: by mail-lj1-x22f.google.com with SMTP id d17so9559539ljl.3 for ; Fri, 24 Jul 2020 04:07:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:user-agent:mime-version; bh=3hvzoS7i0rIEBd4maUt3aMG+eDDcdSDwz4IxCgmivj8=; b=k74sooJ8YXqor22EZGvjRRYfoOZd/2drh+hETCPyXqTD7aTGjBkooP6B5jaupsJUcO 2uRNOQxqhHFtgD8ImlCyhy02YJ0V1Rctk9Avnvcb0txHidDpFgatHBNmXG3eIe/O0//I hCS39JqteWs6RWFeNcpiM1qWPv+IxUi/ftTA0liWGSCIJ4uT8LwWy+viRssOXYSrzVrf bKfbkKoyV0WKJtZQEZouzxIGanQr/sr4+0aem4UP/LyiskDIwuUz0PJwjRmbjEoQCxvv eaZuoDNK/kiA6KuLyokx6kJtIfIhCZR1nT/H35stEECnwDni5I4/fGe6c09LxQ+UNPL8 fSxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:user-agent :mime-version; bh=3hvzoS7i0rIEBd4maUt3aMG+eDDcdSDwz4IxCgmivj8=; b=gs9NF7bI2vH1ggj/X4EAZu08JufZAlCtOpcWZz0PMLXlQpDdKGtZy//Ukj7U5DjWY+ xUq8wpCEvpAohtWwjzBrYQsqnrhH9hBltbe8lVWc2SgA6x2O4Qx18BLLEXtnLkF2qnG7 7pUsxMBB/qYfeX2EaXnOK98HbNwkYPl/AJhQR0AQ8E1WoYxp+oGTdyR/cjK7hQ8x7cWT 4Zu4U2NtbDmhyoqwuUieJ2HYAUowosu5Ihewf0KNf8fShOmqiShZAWU1mIR/WycV+1un Lh76wlkZ2pVlnVUzomEHMDKbad0PQIey001SOKQYh95bLM1IlooZd5L/vpoGUwuhqQet km/Q== X-Gm-Message-State: AOAM533tgNjGtJ37LQnrRiQcw7GevqMhLjQ5PPM4AieitEgkwVmxvm6j pjYiw451/50nxp/Lg+egoIwg33TI X-Google-Smtp-Source: ABdhPJxP+pZK13/rFZoLssGBLbJ2HdhQG+quF+Sv6odzwccmd6FS80UiyEjkr41Y6CB2ZgjRiJaQfQ== X-Received: by 2002:a05:651c:8c:: with SMTP id 12mr3819957ljq.420.1595588828197; Fri, 24 Jul 2020 04:07:08 -0700 (PDT) Original-Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id w5sm172143lji.49.2020.07.24.04.07.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 04:07:07 -0700 (PDT) Received-SPF: pass client-ip=2a00:1450:4864:20::22f; envelope-from=sorganov@gmail.com; helo=mail-lj1-x22f.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.23 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:123579 Archived-At: Hello, To aid in resolution of complex conflicts, I'd like to know if there is a tool in Emacs that, given diff3-style 3-way conflict output, would convert it into 2 simple diffs: "mine" changes from common ancestor, and "yours" changes from common ancestor. Does anybody know about one? I.e., given: <<<<<<< A lines from A ||||||| B lines from B ======= lines from C >>>>>>> C Produce: 1. diff of "lines from B" and "lines from A" 2. diff of "lines from B" and "lines from C" For example, I'd like to be able to select the chunk in the buffer, and call a function that'd create another buffer with these 2 diffs. Thanks, -- Sergey