From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IXCoV-00008d-H5 for qemu-devel@nongnu.org; Mon, 17 Sep 2007 05:22:44 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IXCoS-00007n-VH for qemu-devel@nongnu.org; Mon, 17 Sep 2007 05:22:42 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IXCoS-00007f-In for qemu-devel@nongnu.org; Mon, 17 Sep 2007 05:22:40 -0400 Received: from mail.gmx.net ([213.165.64.20]) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1IXCoS-00070H-2f for qemu-devel@nongnu.org; Mon, 17 Sep 2007 05:22:40 -0400 Date: Mon, 17 Sep 2007 10:21:53 +0100 (BST) From: Johannes Schindelin Subject: Re: [Qemu-devel] qemu Changelog Makefile Makefile.target TODO ae... In-Reply-To: <1190016521.14938.148.camel@rapid> Message-ID: References: <1190016521.14938.148.camel@rapid> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "J. Mayer" Cc: qemu-devel@nongnu.org Hi, On Mon, 17 Sep 2007, J. Mayer wrote: > On Sun, 2007-09-16 at 21:08 +0000, Thiemo Seufer wrote: > > CVSROOT: /sources/qemu > > Module name: qemu > > Changes by: Thiemo Seufer 07/09/16 21:08:06 > > > > [lots of changes] > > > > Log message: > > find -type f | xargs sed -i 's/[\t ]$//g' # on most files > > Many thanks for generating hundreds of conflicts with a useless commit. It is a whitespace fix, designed to remove tabs and spaces from ends of lines, where they have no business of being. Yes, it is a style fix. But a fix nevertheless. And your conflicts are probably DUE TO AN INFERIOUR MERGE TOOL that _you_ use. Time to join the modern world? Ciao, Dscho