Re: [PATCH v3 1/2] merge-file: let conflict markers match end-of-line style of the context

Hi Junio, On Mon, 25 Jan 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > We actually do not have to look at the *entire* context at all: if the > > files are all LF-only, or if they all have CR/LF line endings, it is > > sufficient to look at just a

Re: [PATCH v3 1/2] merge-file: let conflict markers match end-of-line style of the context

On Tue, Jan 26, 2016 at 1:04 AM, Johannes Schindelin wrote: > Not sure. You might end up with a very long line (containing plenty of LF > "characters") and the conflict marker *at the end* of said line, with a > CR/LF after it. I would not call that particularly

Re: [PATCH v3 1/2] merge-file: let conflict markers match end-of-line style of the context

Johannes Schindelin writes: > We actually do not have to look at the *entire* context at all: if the > files are all LF-only, or if they all have CR/LF line endings, it is > sufficient to look at just a *single* line to match that style. And if > the line endings are

Re: [PATCH v3 1/2] merge-file: let conflict markers match end-of-line style of the context

On 25.01.16 09:07, Johannes Schindelin wrote: [] > diff --git a/xdiff/xmerge.c b/xdiff/xmerge.c > index 625198e..c852acc 100644 > --- a/xdiff/xmerge.c > +++ b/xdiff/xmerge.c > @@ -143,6 +143,35 @@ static int xdl_orig_copy(xdfenv_t *xe, int i, int count, > int add_nl, char *dest) > return

Re: [PATCH v3 1/2] merge-file: let conflict markers match end-of-line style of the context

Hi Torsten, On Mon, 25 Jan 2016, Torsten Bögershausen wrote: > On 25.01.16 09:07, Johannes Schindelin wrote: > [] > > diff --git a/xdiff/xmerge.c b/xdiff/xmerge.c > > index 625198e..c852acc 100644 > > --- a/xdiff/xmerge.c > > +++ b/xdiff/xmerge.c > > @@ -143,6 +143,35 @@ static int