From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Rodney Sparapani Newsgroups: gmane.emacs.help Subject: Re: Building on OS X Date: Fri, 27 Dec 2002 09:41:27 -0600 Organization: Medical College of Wisconsin, Milwaukee Sender: help-gnu-emacs-bounces+gnu-help-gnu-emacs=m.gmane.org@gnu.org Message-ID: <3E0C74A7.7060900@mcw.edu> References: NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-Trace: main.gmane.org 1041004948 7845 80.91.224.249 (27 Dec 2002 16:02:28 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Fri, 27 Dec 2002 16:02:28 +0000 (UTC) Return-path: Original-Received: from monty-python.gnu.org ([199.232.76.173]) by main.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 18RwwM-00022O-00 for ; Fri, 27 Dec 2002 17:02:26 +0100 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 18RwuO-00021I-07 for gnu-help-gnu-emacs@m.gmane.org; Fri, 27 Dec 2002 11:00:24 -0500 Original-Path: shelby.stanford.edu!newsfeed.stanford.edu!news-spur1.maxwell.syr.edu!news.maxwell.syr.edu!news.doit.wisc.edu!wiscnews.wiscnet.net!not-for-mail Original-Newsgroups: gnu.emacs.help Original-Lines: 10 Original-NNTP-Posting-Host: markov.biostat.mcw.edu Original-X-Trace: wiscnews.wiscnet.net 1041003688 23490 141.106.120.18 (27 Dec 2002 15:41:28 GMT) Original-X-Complaints-To: usenet@wiscnews.wiscnet.net Original-NNTP-Posting-Date: 27 Dec 2002 15:41:28 GMT User-Agent: Mozilla/5.0 (X11; U; SunOS sun4u; en-US; rv:1.0.1) Gecko/20020920 Netscape/7.0 X-Accept-Language: en-us, en Original-Xref: shelby.stanford.edu gnu.emacs.help:108510 Original-To: help-gnu-emacs@gnu.org X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , Errors-To: help-gnu-emacs-bounces+gnu-help-gnu-emacs=m.gmane.org@gnu.org Xref: main.gmane.org gmane.emacs.help:5039 X-Report-Spam: http://spam.gmane.org/gmane.emacs.help:5039 When you update via CVS, collisions are marked with diff/patch-like syntax. So, you just need to remove those files that are giving you trouble and do another update. -- Rodney Sparapani Medical College of Wisconsin Sr. Biostatistician Patient Care & Outcomes Research rsparapa@mcw.edu http://www.mcw.edu/pcor Was 'Name That Tune' rigged? WWLD -- What Would Lombardi Do