From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: golliher Newsgroups: gmane.emacs.help Subject: Confused by Ediff merging Date: Fri, 24 Nov 2006 11:26:22 -0800 (PST) Message-ID: <7530980.post@talk.nabble.com> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Trace: sea.gmane.org 1164487347 2077 80.91.229.2 (25 Nov 2006 20:42:27 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sat, 25 Nov 2006 20:42:27 +0000 (UTC) Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Sat Nov 25 21:42:25 2006 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1Go4Lt-0004F0-HL for geh-help-gnu-emacs@m.gmane.org; Sat, 25 Nov 2006 21:42:21 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Go4Lt-0006Ox-2u for geh-help-gnu-emacs@m.gmane.org; Sat, 25 Nov 2006 15:42:21 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1GnhWR-0004f2-0F for help-gnu-emacs@gnu.org; Fri, 24 Nov 2006 15:19:43 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1GnhWP-0004di-Gb for Help-gnu-emacs@gnu.org; Fri, 24 Nov 2006 15:19:42 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1GnhWP-0004dD-1f for Help-gnu-emacs@gnu.org; Fri, 24 Nov 2006 15:19:41 -0500 Original-Received: from [72.21.53.35] (helo=talk.nabble.com) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32) (Exim 4.52) id 1Gnggq-0002XJ-3U for Help-gnu-emacs@gnu.org; Fri, 24 Nov 2006 14:26:24 -0500 Original-Received: from [72.21.53.38] (helo=jubjub.nabble.com) by talk.nabble.com with esmtp (Exim 4.50) id 1Gnggo-0007Qf-RE for Help-gnu-emacs@gnu.org; Fri, 24 Nov 2006 11:26:22 -0800 Original-To: Help-gnu-emacs@gnu.org X-Nabble-From: darrell@golliher.net X-Mailman-Approved-At: Sat, 25 Nov 2006 15:42:07 -0500 X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.help:38988 Archived-At: I think I am missing something about Ediff. I tried to use it today to merge .emacs files from two separate hosts. After a session with ediff-merger-buffers I am left with a ediff-merge buffer, but it is sprinkled with lines like: <<<<<<< variant A >>>>>>> variant B ======= end around the regions that I merged from the source files. I would like to have that same buffer only without those additions. I could search and delete them, but I can't help but think I'm missing something fundamental about ediff-merge. The official Ediff manual hasn't been enlightening. So two questions: 1) Anyone know what I'm doing wrong? --or-- 2) Anyone know of a good merging tutorial? -- View this message in context: http://www.nabble.com/Confused-by-Ediff-merging-tf2700740.html#a7530980 Sent from the Emacs - Help mailing list archive at Nabble.com.