From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Two feature ideas for diffs Date: Sun, 10 Nov 2013 08:24:41 -0500 Message-ID: References: <527BCD00.9090105@openmailbox.org> <87d2mcdrgu.fsf@yandex.ru> <877gcia4c5.fsf@web.de> <87fvr61f4d.fsf@wanadoo.es> <877gch1uul.fsf@wanadoo.es> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1384089901 27606 80.91.229.3 (10 Nov 2013 13:25:01 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 10 Nov 2013 13:25:01 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?windows-1252?Q?=D3scar?= Fuentes Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 10 14:25:06 2013 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 1VfV0i-0005aG-Hg for ged-emacs-devel@m.gmane.org; Sun, 10 Nov 2013 14:25:04 +0100 Original-Received: from localhost ([::1]:60316 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VfV0i-0006dH-46 for ged-emacs-devel@m.gmane.org; Sun, 10 Nov 2013 08:25:04 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53991) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VfV0Y-0006d2-4P for emacs-devel@gnu.org; Sun, 10 Nov 2013 08:25:01 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VfV0Q-0006KB-Qt for emacs-devel@gnu.org; Sun, 10 Nov 2013 08:24:54 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.182]:65049) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VfV0Q-0006K6-Ml for emacs-devel@gnu.org; Sun, 10 Nov 2013 08:24:46 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av4EABK/CFHO+LrM/2dsb2JhbABEvw4Xc4IeAQEEAVYjEAs0EhQYDSSIHgbBLZEKA4hhnBmBXoMV X-IPAS-Result: Av4EABK/CFHO+LrM/2dsb2JhbABEvw4Xc4IeAQEEAVYjEAs0EhQYDSSIHgbBLZEKA4hhnBmBXoMV X-IronPort-AV: E=Sophos;i="4.84,565,1355115600"; d="scan'208";a="37502153" Original-Received: from 206-248-186-204.dsl.teksavvy.com (HELO pastel.home) ([206.248.186.204]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 10 Nov 2013 08:24:45 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id 3CEF360630; Sun, 10 Nov 2013 08:24:41 -0500 (EST) In-Reply-To: <877gch1uul.fsf@wanadoo.es> (=?windows-1252?Q?=22=D3scar?= Fuentes"'s message of "Sat, 09 Nov 2013 16:02:42 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.182 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:165112 Archived-At: >> Is it really all it takes to detect `conflict' state? > Git conflict state detection worked when I implemented the feature many > moons ago, although it was not 100% reliable. It doesn't work anymore. > Maybe something was lost on one of the many merges. Could you try and make it work again and submit/install the patch for that? Stefan