From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lars Magne Ingebrigtsen Newsgroups: gmane.emacs.devel Subject: Re: Need review of emacs-25-merge branch Date: Wed, 30 Dec 2015 20:52:51 +0100 Message-ID: References: <83fuyjdi2z.fsf@gnu.org> <83vb7fbuw3.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1451505240 5816 80.91.229.3 (30 Dec 2015 19:54:00 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 30 Dec 2015 19:54:00 +0000 (UTC) Cc: Paul Eggert , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Dec 30 20:53:50 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aEMod-0002HR-IA for ged-emacs-devel@m.gmane.org; Wed, 30 Dec 2015 20:53:47 +0100 Original-Received: from localhost ([::1]:53572 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aEMod-0006Wt-0w for ged-emacs-devel@m.gmane.org; Wed, 30 Dec 2015 14:53:47 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38151) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aEMoB-0006DO-HR for emacs-devel@gnu.org; Wed, 30 Dec 2015 14:53:20 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aEMo8-0003Bx-BH for emacs-devel@gnu.org; Wed, 30 Dec 2015 14:53:19 -0500 Original-Received: from hermes.netfonds.no ([80.91.224.195]:35655) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aEMo8-0003BP-4h; Wed, 30 Dec 2015 14:53:16 -0500 Original-Received: from cm-84.215.1.64.getinternet.no ([84.215.1.64] helo=stories) by hermes.netfonds.no with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1aEMnk-0007tx-9W; Wed, 30 Dec 2015 20:52:52 +0100 Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAFVBMVEWnek3Oq3z979QxEAjl yp5vQyPz3rtalPhFAAACdUlEQVQ4jW2UPXPjIBCGl4lwzV6w6oTJUPtGp974CDUeQh9pyP7/n3Av 2ClyCYUk77Mf8C5rqpmt7M7LWLtz+AzMhgCS4Oewu7H8Hdhh8Ijxd9BSYID55unv/iO6A0oj85cl jSlTkv/tA1BO3wKca4Go2u92bIxIzz8AiaToJ+Absfn1A3CN7PHgcDD/ZQfeyQ3EtIUb8cwXKIeI SLPfKtbI6PVaVQLYiNX+XpZlrW8dnJd1rXnv22UljwvWekUu/3AHmyGdpXSw1OTcc4G5g3OFuvIw wDqJnMHhur/oSktud3BIXqNWLaf9uXYQjwMsbxdfFmyvrPtH7anm7QbypSdFFSWvN/BZ5DrdPqb4 uC605pRe11t1A/eyZMPHshAC7WaQWNfrsV456ClMKEtZtSQSzaHpycw4ZIvBSgcccU0CmnI8lQNU CdFw1ABGoekNAJWzc08l68qokelqASx0OpV6cX+XtSwQCaCiuVuETn8KtIeiXbsVlyGb2T1b95Qn DXCXIRONKpLcM+lad2eG1qvGZSDWKsb9BTKRc+8j4KTJcrAIsxdInZWTD+q6EECMiZlsajrnyYnh 3mhDHbTIHFMzSim/KQtwOhNxB8HGJMHy5F+nBvDb6A4ktdaixBRnH1JvqOIRIVG6kJKgjQhANaaS srHZPq67HyMn7XEhcwRASMD53N4anrKhfZYBmDlwn0Kx0vOF+HCVoDuw3Cfdy4xaDqAcGqYcqWzg 7gr/2CPCOm9QbQDb7TgJHEI45xhwubBf7qChVuS5qTPexwEUqsQY0RhDNryZaJT+BBAsoBtH3KiJ I+X6CczU/2+yJgpWhT5epfwDWNDhd3RmDsUAAAAASUVORK5CYII= In-Reply-To: (John Wiegley's message of "Wed, 30 Dec 2015 11:49:34 -0800") User-Agent: Gnus/5.130014 (Ma Gnus v0.14) Emacs/25.1.50 (gnu/linux) X-MailScanner-ID: 1aEMnk-0007tx-9W MailScanner-NULL-Check: 1452109973.19132@yNuZLrqFt6QqN8ggrZXsiw X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.224.195 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:197197 Archived-At: John Wiegley writes: > I was presented with the same 12 merge conflicts; it took all of 1 second to > perform that merge; and I would have had to resolve the same conflicts in the > same way I did when using git-imerge. Only, it would have proceeded in a > fraction of the time. :-) Can you post the twelve merge conflicts? That would make it easier to see whether the results are what we want... -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no