On Thu, Aug 9, 2018 at 10:52 AM Junio C Hamano wrote:
> Elijah Newren writes:
>
> > 1) Representative example: A modify/delete conflict; the path in question
> > in the working tree would have conflict information at the top of the file
> > followed by the normal file contents; thus it could be o
Elijah Newren writes:
> 1) Representative example: A modify/delete conflict; the path in question
> in the working tree would have conflict information at the top of the file
> followed by the normal file contents; thus it could be of the form:
>
> HEAD
> Conflict hint: This bloc
== Summary ==
For non-textual conflicts, I would like to provide additional information
in the working copy in the form of additional conflict markers and
explanatory text stating what type of non-textual conflict was involved.
This should
* Make it clearer to users what conflicts they are deali
3 matches
Mail list logo
