From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Alan Mackenzie Newsgroups: gmane.emacs.devel Subject: Re: git pull fails with merge conflicts. How can this possibly happen? Date: Tue, 18 Nov 2014 22:57:51 +0000 Message-ID: <20141118225750.GB5167@acm.acm> References: <20141114183737.GB3168@acm.acm> <5466517B.50705@porkrind.org> <20141114215404.GD3168@acm.acm> <838ujchods.fsf@gnu.org> <8761egx1k2.fsf@uwakimon.sk.tsukuba.ac.jp> <83sihkg2ds.fsf@gnu.org> <83389hdd7u.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1416351529 20439 80.91.229.3 (18 Nov 2014 22:58:49 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 18 Nov 2014 22:58:49 +0000 (UTC) Cc: Eli Zaretskii , Sergey Organov , emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 18 23:58:43 2014 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 1XqrjL-0002Ri-Ih for ged-emacs-devel@m.gmane.org; Tue, 18 Nov 2014 23:58:39 +0100 Original-Received: from localhost ([::1]:55811 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqrjL-0001mx-2p for ged-emacs-devel@m.gmane.org; Tue, 18 Nov 2014 17:58:39 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60807) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqrjD-0001mr-J7 for emacs-devel@gnu.org; Tue, 18 Nov 2014 17:58:37 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xqrj7-00027t-SF for emacs-devel@gnu.org; Tue, 18 Nov 2014 17:58:31 -0500 Original-Received: from colin.muc.de ([193.149.48.1]:32298 helo=mail.muc.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xqrj7-00027d-JZ for emacs-devel@gnu.org; Tue, 18 Nov 2014 17:58:25 -0500 Original-Received: (qmail 80780 invoked by uid 3782); 18 Nov 2014 22:58:23 -0000 Original-Received: from acm.muc.de (pD951BE3D.dip0.t-ipconnect.de [217.81.190.61]) by colin.muc.de (tmda-ofmipd) with ESMTP; Tue, 18 Nov 2014 23:58:21 +0100 Original-Received: (qmail 5248 invoked by uid 1000); 18 Nov 2014 22:57:51 -0000 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Delivery-Agent: TMDA/1.1.12 (Macallan) X-Primary-Address: acm@muc.de X-detected-operating-system: by eggs.gnu.org: FreeBSD 8.x X-Received-From: 193.149.48.1 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:177691 Archived-At: Hello, Glenn. On Mon, Nov 17, 2014 at 10:29:53PM -0500, Glenn Morris wrote: > Eli Zaretskii wrote: > > And I don't want to even start comparing the quality of the Emacs > > documentation with that of Git. > http://git-man-page-generator.lokaltog.net/ Ha! That is good! Thanks! -- Alan Mackenzie (Nuremberg, Germany).