On 2009-02-07, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> Sitaram Chamarty <sitaramc@xxxxxxxxx> 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.
It's basically the same thing as the explanation for --merge
in 'git help log':
--merge
After a failed merge, show refs that touch files
having a conflict and don´t exist on all heads to
merge.
I'm pretty sure gitk is doing the same thing, so I thought
the extra text should be added.
Regards,
Sitaram
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
