Here's a slightly expanded series based on my ll-merge normalization patch. I've been working in a repository that uses "* text=auto" at $dayjob, and this series helps a lot when merging older, pre-normalization branches. The first commit is a cleaned-up version of the previous patch. I borrowed Finn Arne's explanation for why it's useful for my commit message, ASCII art and all. The idea is pretty simple: normalization might differ between branches, so renormalization is required to prevent (or at least reduce) conflicts. The second fixes a similar problem, but for delete/modify conflicts. If a file is normalized on a branch but deleted in another, merging the branches will cause a conflict even though the actual content of the file hasn't changed at all. If the merge-base version of the file and the modified file differ they are both normalized, and if either was changed by normalization they are compared. If they compare equal, the file is considered unmodified and is deleted. The third patch prevents normalization from expanding and then collapsing CRLFs, saving time and memory when core.autocrlf=true or core.eol=crlf. - Eyvind Eyvind Bernhardsen (3): Avoid conflicts when merging branches with mixed normalization Try normalizing files to avoid delete/modify conflicts when merging Don't expand CRLFs when normalizing text during merge cache.h | 1 + convert.c | 27 ++++++++++++++++---- ll-merge.c | 12 +++++++++ merge-recursive.c | 42 ++++++++++++++++++++++++++++++- t/t6038-merge-text-auto.sh | 58 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 133 insertions(+), 7 deletions(-) create mode 100755 t/t6038-merge-text-auto.sh -- 1.7.1.575.g383de -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html