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. -- 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
