Re: [PATCH v2 00/10] rerere: handle nested conflicts

2018-07-10 Thread Thomas Gummerer
On 07/06, Junio C Hamano wrote: > Thomas Gummerer writes: > > > On 06/05, Thomas Gummerer wrote: > >> The previous round was at > >> <20180520211210.1248-1-t.gumme...@gmail.com>. > >> > >> Thanks Junio for the comments on the previous round. > >> > >> Changes since v2: > >> - lowercase the fir

Re: [PATCH v2 00/10] rerere: handle nested conflicts

2018-07-06 Thread Junio C Hamano
Thomas Gummerer writes: > On 06/05, Thomas Gummerer wrote: >> The previous round was at >> <20180520211210.1248-1-t.gumme...@gmail.com>. >> >> Thanks Junio for the comments on the previous round. >> >> Changes since v2: >> - lowercase the first letter in some error/warning messages before >>

Re: [PATCH v2 00/10] rerere: handle nested conflicts

2018-07-03 Thread Thomas Gummerer
On 06/05, Thomas Gummerer wrote: > The previous round was at > <20180520211210.1248-1-t.gumme...@gmail.com>. > > Thanks Junio for the comments on the previous round. > > Changes since v2: > - lowercase the first letter in some error/warning messages before >marking them for translation > -

[PATCH v2 00/10] rerere: handle nested conflicts

2018-06-05 Thread Thomas Gummerer
The previous round was at <20180520211210.1248-1-t.gumme...@gmail.com>. Thanks Junio for the comments on the previous round. Changes since v2: - lowercase the first letter in some error/warning messages before marking them for translation - wrap paths in output in single quotes, for consiste