From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.176.0/21 X-Spam-Status: No, score=-3.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MSGID_FROM_MTA_HEADER,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 From: Han-Wen Nienhuys Subject: Re: git UI nit Date: Wed, 06 Dec 2006 16:41:31 +0100 Message-ID: <4576E4AB.8010608@xs4all.nl> References: <4576DD27.6050307@xs4all.nl> Reply-To: hanwen@xs4all.nl Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit NNTP-Posting-Date: Wed, 6 Dec 2006 15:41:37 +0000 (UTC) Cc: git@vger.kernel.org Return-path: Envelope-to: gcvg-git@gmane.org User-Agent: Thunderbird 1.5.0.8 (X11/20061107) Original-Newsgroups: gmane.comp.version-control.git In-Reply-To: X-Virus-Scanned: by XS4ALL Virus Scanner Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Received: from vger.kernel.org ([209.132.176.167]) by dough.gmane.org with esmtp (Exim 4.50) id 1Grytk-00050Q-Hl for gcvg-git@gmane.org; Wed, 06 Dec 2006 16:41:28 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935795AbWLFPlZ (ORCPT ); Wed, 6 Dec 2006 10:41:25 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S935778AbWLFPlZ (ORCPT ); Wed, 6 Dec 2006 10:41:25 -0500 Received: from smtp-vbr9.xs4all.nl ([194.109.24.29]:4455 "EHLO smtp-vbr9.xs4all.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935871AbWLFPlX (ORCPT ); Wed, 6 Dec 2006 10:41:23 -0500 Received: from [192.168.123.187] (muurbloem.xs4all.nl [213.84.26.127]) (authenticated bits=0) by smtp-vbr9.xs4all.nl (8.13.8/8.13.8) with ESMTP id kB6FfLMs013873 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 6 Dec 2006 16:41:21 +0100 (CET) (envelope-from hanwen@xs4all.nl) To: Johannes Schindelin Sender: git-owner@vger.kernel.org Johannes Schindelin escreveu: > Actually, I like it that short. > > We had an email on this list, where the poster said he could not merge > with Git. It turned out that the merge failed with conflicts, but he > did not bother reading through the messages, apparently because they were > too many. good point. --