From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Steinar Bang Newsgroups: gmane.emacs.devel Subject: Re: git is screwed Date: Fri, 27 Mar 2015 21:36:49 +0100 Organization: Probably a good idea Message-ID: <86619mqise.fsf@dod.no> References: <20150322154147.GA6808@Tron.local> <20150323045209.GA71859@Tron.local> <550FE343.8010607@math.ntnu.no> <55119019.6030507@math.ntnu.no> <5513E96D.8070204@math.ntnu.no> <83twx7n0zz.fsf@gnu.org> <86a8yzshst.fsf@dod.no> <83k2y3mrjk.fsf@gnu.org> <83fv8qnbrk.fsf@gnu.org> <86mw2yqln6.fsf@dod.no> <83egoa1aal.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1427488670 30255 80.91.229.3 (27 Mar 2015 20:37:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 27 Mar 2015 20:37:50 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 27 21:37:42 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 1Ybb0b-0000UI-4F for ged-emacs-devel@m.gmane.org; Fri, 27 Mar 2015 21:37:37 +0100 Original-Received: from localhost ([::1]:51786 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ybb0a-0001wZ-73 for ged-emacs-devel@m.gmane.org; Fri, 27 Mar 2015 16:37:36 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51671) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ybb0V-0001wT-Kr for emacs-devel@gnu.org; Fri, 27 Mar 2015 16:37:32 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ybb0Q-0000s5-IC for emacs-devel@gnu.org; Fri, 27 Mar 2015 16:37:31 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:37405) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ybb0Q-0000rs-B1 for emacs-devel@gnu.org; Fri, 27 Mar 2015 16:37:26 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Ybb07-00008Y-AA for emacs-devel@gnu.org; Fri, 27 Mar 2015 21:37:07 +0100 Original-Received: from cm-84.208.248.210.getinternet.no ([84.208.248.210]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 27 Mar 2015 21:37:07 +0100 Original-Received: from sb by cm-84.208.248.210.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 27 Mar 2015 21:37:07 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 11 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: cm-84.208.248.210.getinternet.no Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (windows-nt) Cancel-Lock: sha1:s6dXWQ0hdJs7RDyHCJUkMmRDcwg= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:184432 Archived-At: >>>>> Eli Zaretskii : > Then I wonder why you'd want smerge-mode at all. The "is fantastic" part of the subject of the mentioned thread, makes it quite possible that I'll try it out when it eventually comes my way. Maybe I'll love it, maybe I'll hate it, maybe I'll disable the automated add... who knows...? The future is full of possibilites.