Junio C Hamano writes:
> Imagine that you started from a history where somebody recorded a
> text file with CRLF in the blob, unconverted. Later the project
> decided to express their text with LF to support cross-platform
> development better, and sets up the Auto-CRLF. Your user is working
>
tbo...@web.de writes:
> This is a little bit of a hen-and-egg problem:
> The problem comes up after the "unified auto handling".
> In theory, it should have been since before:
> get_sha1_from_index() says:
>
> * We might be in the middle of a merge, in which
> * case we would read stage #2 (ours
From: Torsten Bögershausen
Split of the old 10/10 series.
This is the update of t6038, which is needed to
motivate the patch
`convert: ce_compare_data() checks for a sha1 of a path`
on top of
`convert: unify the "auto" handling of CRLF`
When files with different eols are merged with
merge.
3 matches
Mail list logo
