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: Move to git is imminent - awaiting Stefan's approval Date: Tue, 07 Jan 2014 08:45:47 -0500 Message-ID: References: <20140106165108.B6BF4380865@snark.thyrsus.com> <83zjn9rpaz.fsf@gnu.org> <8761pwxt24.fsf@gmail.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1389102363 29849 80.91.229.3 (7 Jan 2014 13:46:03 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 7 Jan 2014 13:46:03 +0000 (UTC) Cc: emacs-devel@gnu.org To: Thierry Volpiatto Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 07 14:46:09 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 1W0Wys-0004aq-7w for ged-emacs-devel@m.gmane.org; Tue, 07 Jan 2014 14:46:06 +0100 Original-Received: from localhost ([::1]:40771 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0Wyr-0005AP-Lg for ged-emacs-devel@m.gmane.org; Tue, 07 Jan 2014 08:46:05 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45987) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0Wyh-00059F-QD for emacs-devel@gnu.org; Tue, 07 Jan 2014 08:46:03 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0Wya-0006j3-GF for emacs-devel@gnu.org; Tue, 07 Jan 2014 08:45:55 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:26726) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0Wya-0006iw-C8 for emacs-devel@gnu.org; Tue, 07 Jan 2014 08:45:48 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av4EABK/CFFFxKG9/2dsb2JhbABEvw4Xc4IeAQEEAVYjBQsLNBIUGA0kiB4GsR+QDpEKA4hhnBmBXoMV X-IPAS-Result: Av4EABK/CFFFxKG9/2dsb2JhbABEvw4Xc4IeAQEEAVYjBQsLNBIUGA0kiB4GsR+QDpEKA4hhnBmBXoMV X-IronPort-AV: E=Sophos;i="4.84,565,1355115600"; d="scan'208";a="44371939" Original-Received: from 69-196-161-189.dsl.teksavvy.com (HELO pastel.home) ([69.196.161.189]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 07 Jan 2014 08:45:47 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id 703EE604FE; Tue, 7 Jan 2014 08:45:47 -0500 (EST) In-Reply-To: <8761pwxt24.fsf@gmail.com> (Thierry Volpiatto's message of "Tue, 07 Jan 2014 06:24:51 +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.181 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:167602 Archived-At: > You can use git-mergetool with ediff-merge for this. I find ediff too heavy, so it would have to be smerge-mode instead. But, while I'd be happy to take patches to better support git-mergetool (if needed), I prefer using the vc-find-conflicted-files workflow. It could probably run git-mergetool internally. Stefan