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: Re: Looking for a helper for advanced conflicts resolution. Date: Fri, 24 Jul 2020 22:56:30 +0300 Message-ID: <87a6zolma9.fsf@osv.gnss.ru> References: <878sf9tbmt.fsf@osv.gnss.ru> <87blk4g9rh.fsf@web.de> <87imeclqyz.fsf@osv.gnss.ru> <871rl0g0dm.fsf@web.de> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="9439"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: help-gnu-emacs@gnu.org To: Michael Heerdegen Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jul 24 21:56:57 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 1jz3oO-0002MY-W2 for geh-help-gnu-emacs@m.gmane-mx.org; Fri, 24 Jul 2020 21:56:56 +0200 Original-Received: from localhost ([::1]:48478 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jz3oO-0001bR-1Y for geh-help-gnu-emacs@m.gmane-mx.org; Fri, 24 Jul 2020 15:56:56 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:42884) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jz3o4-0001bH-6k for help-gnu-emacs@gnu.org; Fri, 24 Jul 2020 15:56:36 -0400 Original-Received: from mail-lj1-x231.google.com ([2a00:1450:4864:20::231]:45400) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jz3o2-0006GR-NC for help-gnu-emacs@gnu.org; Fri, 24 Jul 2020 15:56:35 -0400 Original-Received: by mail-lj1-x231.google.com with SMTP id r19so11116191ljn.12 for ; Fri, 24 Jul 2020 12:56:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=/PFjMM5ikJh6tTyl/i9QMJctcZR1wozXHoT5x6U1D1Q=; b=VzwgiNTPpqmoZZyXxJWsOnBZ/iv8NQnjqDwraao9N0T7qvUoubQSX182ZOxaTdsjgy z6DiOMOJJ6IqistWr+g/L0+ARHTHiyFwiJAptBrET/FTun1opQTZ8jFj2EkFarKm6hkA 2o5zh2fPlPCLVUzXqJj+eGb5E9p6ATVTCI15OapMKWd9/j7goK3SHg6ey6IwXaEHHi8a fC8ETbeUe+9/gu+/fo5urhlIFwm562xO7vSrb38IPjL8JzBJaAA+NrJCYGJqal28hc5k L/HqEynBnV5pj2uxAZHCKrHfbqrxk0N0Q4nRRB6S8Ohlf7I58u5zE7+H6e3/PChtOBJJ pjJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=/PFjMM5ikJh6tTyl/i9QMJctcZR1wozXHoT5x6U1D1Q=; b=n30/l6kvsqQxcPdxYZqceqTqak3eun5bAQ8NNhEp5LUK37zYF3Rra+AI39QfNJP4oK 48R56s4ca+X/SfaIoHEtjTevYML2PsRiNRMsrAZwmbHlwkNn7V9kmfXWQcEjT5c3NHVA vd6nwAxdg8qj+N4ZzeU23HsgEpwsZGQCFfeelgmlWCtmnBX5GqcScumhRoJV+9tfmRqK LqtCQjtLWcmw8Bm7ZRiqvgHt+MpktdIt153UfiWcMbHx7CojP4pSOGyXYRJ5GMO4BQ5i vERbFNGmTMK1hrgWqlNlkVwmpbHjjGQ5N8QvXN0i7nFtMUtCtQR2Vjd0ImftA4czbh/A i8lQ== X-Gm-Message-State: AOAM530ycwVeNfMe5vhlOY4qJ/jPHP7msQ6MCaQIuuMoj6C3lQKEtz1u lw521SjnVEgRgGeXjM4Ch1Obj7EM X-Google-Smtp-Source: ABdhPJz2fHNne0rMsIobLx7m38fvRcIcFZRK2OVn3hJzs6NCTo8CGbbq5k0gZmtmT2oiSqdHu3Lv2g== X-Received: by 2002:a2e:8798:: with SMTP id n24mr4720941lji.372.1595620592180; Fri, 24 Jul 2020 12:56:32 -0700 (PDT) Original-Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id n25sm455624lji.28.2020.07.24.12.56.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 12:56:30 -0700 (PDT) In-Reply-To: <871rl0g0dm.fsf@web.de> (Michael Heerdegen's message of "Fri, 24 Jul 2020 21:48:37 +0200") Received-SPF: pass client-ip=2a00:1450:4864:20::231; envelope-from=sorganov@gmail.com; helo=mail-lj1-x231.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:123586 Archived-At: Michael Heerdegen writes: > Sergey Organov writes: > >> Yeah, that was my first candidate, and I've tried to invoke it from >> magit, but it doesn't seem indeed to have the feature. Implementing it >> probably is not a big deal indeed [...] > > I did implement that but haven't yet packaged it. Thanks for letting know it's coming! Exactly as it should be for Swiss-army knife of merging and diffing. -- Sergey