From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jakub Narebski Subject: Re: [PATCH 2/2] git-merge documentation: describe how conflict is presented Date: Mon, 01 Sep 2008 12:29:09 +0200 Organization: At home Message-ID: References: <7vwshwz8gf.fsf@gitster.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7Bit To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon Sep 01 12:30:32 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 1Ka6fx-0005di-05 for gcvg-git-2@gmane.org; Mon, 01 Sep 2008 12:30:25 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751182AbYIAK3S (ORCPT ); Mon, 1 Sep 2008 06:29:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751657AbYIAK3R (ORCPT ); Mon, 1 Sep 2008 06:29:17 -0400 Received: from main.gmane.org ([80.91.229.2]:34297 "EHLO ciao.gmane.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751055AbYIAK3R (ORCPT ); Mon, 1 Sep 2008 06:29:17 -0400 Received: from list by ciao.gmane.org with local (Exim 4.43) id 1Ka6eq-0007bG-9k for git@vger.kernel.org; Mon, 01 Sep 2008 10:29:16 +0000 Received: from abvq20.neoplus.adsl.tpnet.pl ([83.8.214.20]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 01 Sep 2008 10:29:16 +0000 Received: from jnareb by abvq20.neoplus.adsl.tpnet.pl with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 01 Sep 2008 10:29:16 +0000 X-Injected-Via-Gmane: http://gmane.org/ X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: abvq20.neoplus.adsl.tpnet.pl Mail-Copies-To: Jakub Narebski User-Agent: KNode/0.10.2 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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" -- Jakub Narebski Warsaw, Poland ShadeHawk on #git