From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: [PATCH 2/2] git-merge documentation: describe how conflict is presented Date: Mon, 01 Sep 2008 03:43:33 -0700 Message-ID: <7vd4jow3hm.fsf@gitster.siamese.dyndns.org> References: <7vwshwz8gf.fsf@gitster.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org To: Jakub Narebski X-From: git-owner@vger.kernel.org Mon Sep 01 12:44:49 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1Ka6ts-0001BU-L4 for gcvg-git-2@gmane.org; Mon, 01 Sep 2008 12:44:49 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753197AbYIAKnn (ORCPT ); Mon, 1 Sep 2008 06:43:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753016AbYIAKnn (ORCPT ); Mon, 1 Sep 2008 06:43:43 -0400 Received: from a-sasl-quonix.sasl.smtp.pobox.com ([208.72.237.25]:60472 "EHLO sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752742AbYIAKnm (ORCPT ); Mon, 1 Sep 2008 06:43:42 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by a-sasl-quonix.sasl.smtp.pobox.com (Postfix) with ESMTP id 3A79B6A991; Mon, 1 Sep 2008 06:43:39 -0400 (EDT) Received: from pobox.com (ip68-225-240-211.oc.oc.cox.net [68.225.240.211]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by a-sasl-quonix.sasl.smtp.pobox.com (Postfix) with ESMTPSA id D7E846A990; Mon, 1 Sep 2008 06:43:35 -0400 (EDT) In-Reply-To: (Jakub Narebski's message of "Mon, 01 Sep 2008 12:29:09 +0200") User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux) X-Pobox-Relay-ID: D65A31DE-7812-11DD-867A-3113EBD4C077-77302942!a-sasl-quonix.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Jakub Narebski writes: > Junio C Hamano wrote: > >> +By default, git uses the same style as that is used by "merge" program >> +from the RCS suite to present such a conflicted hunk, like this: > > Actually it is also one of diff3 output format, to be more exact it is > format generated by "diff3 -E"/"diff3 --show-overlap" I took this from "diff3 -m" format, fwiw.