From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 07 Feb 2009 21:45:33 GMT
Subject: Re: [PATCH] Documentation: clarify commits affected by gitk --merge
Message-ID: <7vtz75udj6.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20090206044053.GA6831@atcmail.atc.tcs.com>

Sitaram Chamarty <sitaramc@gmail.com> writes:

>  	After an attempt to merge stops with conflicts, show the commits on
>  	the history between two branches (i.e. the HEAD and the MERGE_HEAD)
> -	that modify the conflicted files.
> +	that modify the conflicted files and do not exist on all the heads
> +	being merged.

I do not understand what you are trying to add here, sorry.