From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: git pull fails with merge conflicts. How can this possibly happen? Date: Mon, 17 Nov 2014 22:29:53 -0500 Message-ID: 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 1416281410 1990 80.91.229.3 (18 Nov 2014 03:30:10 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 18 Nov 2014 03:30:10 +0000 (UTC) Cc: Sergey Organov , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 18 04:30:02 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 1XqZUO-0002N3-6D for ged-emacs-devel@m.gmane.org; Tue, 18 Nov 2014 04:30:00 +0100 Original-Received: from localhost ([::1]:51134 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqZUN-0005m0-6z for ged-emacs-devel@m.gmane.org; Mon, 17 Nov 2014 22:29:59 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55967) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqZUK-0005ls-1C for emacs-devel@gnu.org; Mon, 17 Nov 2014 22:29:56 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XqZUI-0004SJ-Rx for emacs-devel@gnu.org; Mon, 17 Nov 2014 22:29:55 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:59615) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqZUI-0004SD-Oy for emacs-devel@gnu.org; Mon, 17 Nov 2014 22:29:54 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1XqZUH-00052p-U6; Mon, 17 Nov 2014 22:29:53 -0500 X-Spook: Nazi ARPA S Box benelux diwn Mafia top secret ASDIC X-Ran: Y6$yb0B8#$C'DY~NrHAYRQe?nzfK{o,T$v?H;fbhIce<5^K?1rgB6$1KPi?x3tk-KM<6yK X-Hue: yellow X-Attribution: GM In-Reply-To: <83389hdd7u.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 17 Nov 2014 18:05:41 +0200") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). 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:177514 Archived-At: 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/