From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Barry Warsaw Newsgroups: gmane.emacs.devel Subject: Re: Move to git is imminent - awaiting Stefan's approval Date: Wed, 8 Jan 2014 16:12:50 -0500 Organization: Damn Crazy Followers of the Horn Message-ID: <20140108161250.6449a8ff@anarchist.wooz.org> References: <20140106165108.B6BF4380865@snark.thyrsus.com> <83zjn9rpaz.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/jsndNb.c3=L_rVpWkrGn4iH"; protocol="application/pgp-signature" X-Trace: ger.gmane.org 1389215602 13665 80.91.229.3 (8 Jan 2014 21:13:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 8 Jan 2014 21:13:22 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jan 08 22:13:27 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 1W10RJ-0000cG-RB for ged-emacs-devel@m.gmane.org; Wed, 08 Jan 2014 22:13:25 +0100 Original-Received: from localhost ([::1]:48960 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W10RJ-00006w-CT for ged-emacs-devel@m.gmane.org; Wed, 08 Jan 2014 16:13:25 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40914) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W10R9-00006P-F6 for emacs-devel@gnu.org; Wed, 08 Jan 2014 16:13:22 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W10R2-0000LQ-5w for emacs-devel@gnu.org; Wed, 08 Jan 2014 16:13:15 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:48913) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W10R1-0000LK-Un for emacs-devel@gnu.org; Wed, 08 Jan 2014 16:13:08 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1W10Qv-0008Av-QV for emacs-devel@gnu.org; Wed, 08 Jan 2014 22:13:01 +0100 Original-Received: from mail.wooz.org ([216.15.33.194]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 08 Jan 2014 22:13:01 +0100 Original-Received: from barry by mail.wooz.org with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 08 Jan 2014 22:13:01 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 41 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: mail.wooz.org X-Newsreader: Claws Mail 3.9.3 (GTK+ 2.24.22; x86_64-pc-linux-gnu) 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:167813 Archived-At: --Sig_/jsndNb.c3=L_rVpWkrGn4iH Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Jan 06, 2014, at 04:09 PM, Stefan Monnier wrote: >- Improve vc-git.el so that it can automatically enable smerge-mode when > opening a conflicted file and (probably conditional on a config var) > mark the file as "not conflicted any more" when saving with no > remaining diff3 markers. > This currently works in vc-bzr.el (and vc-svn.el as well, IIRC). Yes please! It's one huge feature I'm missing when working in git repos as opposed to bzr repos. -Barry --Sig_/jsndNb.c3=L_rVpWkrGn4iH Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.15 (GNU/Linux) iQIcBAEBCAAGBQJSzb9SAAoJEBJutWOnSwa/1NIP/1kZCODdRYoC1EdDXnnh+ti4 pMjwy/CFmqeMh++nI7NVRTUPMkxlbC+cTqGeX9Dv9VDzk91NlBAN3bbzdNnRxT2r +K4o9aMJmtZ9dMmJsti+ODQquQcgA+c7Y5Oyx+vBkFIk6w2ez/sTxMiLE9kIK9w5 A77vM6fQNKy0cF06AURkoyg0bpwXr3BLgOgAoxtOV97HBxdfe3IfQcJcfAU3kieq hrW32Tzp4FGhrWsG1ES7SuorD+ocV4s3RbN7wgk2doofHsbKJclYMuqRHR2GMhTc +bj7tSvNRFcpn0+PGOFIjVliJLYG+2Js/J5++2sgp6KN0eiyIA3+iiYiU4nqs0HD oKL0wTiVTwI2RjeymALPRpx29PHpofi3ArQ97dLkIBpl53IWoFCkKItZLbpqGPDw RdBnXPVB7YvIqpIBLA1vSKmdnO9mgPaYnihcLctrKVVJ+yB1BIQE+ftHHiBXE8a6 FBcz2vE2UxwuuiWi0DA0M2V3TSclrHWWMIizCa0+gWUOfceyQyUzBkN0Tka9GlOo m16nCMeFBKyoC60t8VDRAFWQnvK3m9/MysbEkdTX8lhaHJl/iASvaeJNscqaVrQZ gXW6y08ss5t3iQNIBwPukqj69GkdPdzCSLOoavbI4HkJ4ae7JjRr38nLTQxPejoT 7w3qSfulXzXANrG7bXt0 =U+uU -----END PGP SIGNATURE----- --Sig_/jsndNb.c3=L_rVpWkrGn4iH--