From b94af6a674a86b8d83493dd60ae32412b0f7e7ee Mon Sep 17 00:00:00 2001 From: Jackie Leng Date: Tue, 13 Jun 2017 12:36:59 +0200 Subject: [PATCH] Saving files before changing line endings --- .gitattributes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitattributes b/.gitattributes index 6f9ff673b..8b822d567 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,4 @@ CHANGES.rst merge=union + +# Set the default behavior, in case people don't have core.autocrlf set. +* text=auto