From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.devel Subject: Re: Having a custom merge process (was: EWW bugs should be fixed on emacs-25 branch) Date: Sat, 26 Dec 2015 21:52:30 -0500 Message-ID: References: <8337urm0cv.fsf@gnu.org> <83ziwzkl50.fsf@gnu.org> <87lh8jvsqh.fsf@fencepost.gnu.org> <83si2qliho.fsf@gnu.org> <83d1tulaa1.fsf@gnu.org> <838u4il3jf.fsf@gnu.org> <83y4cijo24.fsf@gnu.org> <83twn6jm7e.fsf@gnu.org> <87twn686cn.fsf@isaac.fritz.box> <837fk1k0i4.fsf@gnu.org> Reply-To: rms@gnu.org NNTP-Posting-Host: plane.gmane.org Content-Type: text/plain; charset=Utf-8 X-Trace: ger.gmane.org 1451184823 13699 80.91.229.3 (27 Dec 2015 02:53:43 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 27 Dec 2015 02:53:43 +0000 (UTC) Cc: jwiegley@gmail.com, larsi@gnus.org, deng@randomsample.de, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Dec 27 03:53:34 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 1aD1Sd-0006Ze-QK for ged-emacs-devel@m.gmane.org; Sun, 27 Dec 2015 03:53:31 +0100 Original-Received: from localhost ([::1]:40573 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aD1Sd-00051O-A0 for ged-emacs-devel@m.gmane.org; Sat, 26 Dec 2015 21:53:31 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34605) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aD1Rv-0004Ip-S5 for emacs-devel@gnu.org; Sat, 26 Dec 2015 21:52:48 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aD1Rv-0002yZ-27 for emacs-devel@gnu.org; Sat, 26 Dec 2015 21:52:47 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:34616) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aD1Rf-0002rv-BD; Sat, 26 Dec 2015 21:52:31 -0500 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1aD1Re-0003ov-Ic; Sat, 26 Dec 2015 21:52:30 -0500 In-reply-to: <837fk1k0i4.fsf@gnu.org> (message from Eli Zaretskii on Sat, 26 Dec 2015 11:44:19 +0200) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e 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:196954 Archived-At: [[[ To any NSA and FBI agents reading my email: please consider ]]] [[[ whether defending the US Constitution against all enemies, ]]] [[[ foreign or domestic, requires you to follow Snowden's example. ]]] > Newcomers are told to use gitmerge.el, so how that could be a problem? There is no file gitmerge.el in the Emacs release. Where is gitmerge.el distributed? -- Dr Richard Stallman President, Free Software Foundation (gnu.org, fsf.org) Internet Hall-of-Famer (internethalloffame.org) Skype: No way! See stallman.org/skype.html.