From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.devel Subject: Avoiding the three-windows merging with Git Date: Sun, 24 Nov 2019 22:14:27 -0500 Message-ID: Reply-To: rms@gnu.org Content-Type: text/plain; charset=Utf-8 Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="164707"; mail-complaints-to="usenet@blaine.gmane.org" To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 25 04:16:33 2019 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iZ4rZ-000gi0-GM for ged-emacs-devel@m.gmane.org; Mon, 25 Nov 2019 04:16:33 +0100 Original-Received: from localhost ([::1]:39920 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZ4rY-0002aM-Ae for ged-emacs-devel@m.gmane.org; Sun, 24 Nov 2019 22:16:32 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:49549) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZ4pY-0000pi-OR for emacs-devel@gnu.org; Sun, 24 Nov 2019 22:14:29 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:58245) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iZ4pY-0000ux-Jz for emacs-devel@gnu.org; Sun, 24 Nov 2019 22:14:28 -0500 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1iZ4pX-0004rT-Ms; Sun, 24 Nov 2019 22:14:27 -0500 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 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" Xref: news.gmane.org gmane.emacs.devel:242697 Archived-At: [[[ To any NSA and FBI agents reading my email: please consider ]]] [[[ whether defending the US Constitution against all enemies, ]]] [[[ foreign or domestic, requires you to follow Snowden's example. ]]] Has anyone figured out why merge conflicts go into a mode with three windows, and some way to turn that off without breaking anything else? I would really appreciate that help, since with it I could make another attempt to use Git, and perhaps this time understand how to cope with the conflicts. -- Dr Richard Stallman Founder, Free Software Foundation (https://gnu.org, https://fsf.org) Internet Hall-of-Famer (https://internethalloffame.org)