Re: [RFC/PATCH 3/7] rerere: add some documentation

On 05/24, Junio C Hamano wrote: > Thomas Gummerer writes: > > > +Conflict normalization > > +-- > > + > > +To try and re-do a conflict resolution, even when different merge > > +strategies are used, 'rerere' computes a conflict ID for each > > +conflict in the file. > > + > >

Re: [RFC/PATCH 3/7] rerere: add some documentation

Thomas Gummerer writes: > +Conflict normalization > +-- > + > +To try and re-do a conflict resolution, even when different merge > +strategies are used, 'rerere' computes a conflict ID for each > +conflict in the file. > + > +This is done by discarding