Merge git://repo.or.cz/git-gui into pt/git-gui

diff --git a/attr.c b/attr.c
index 7467baf2d6c81f94a7d043dcde13d463b3b46272..8ba606c933088e27ac08aabb546b764745f8187e 100644 (file)
--- a/attr.c
+++ b/attr.c
@@ -287,7 +287,7 @@ static void free_attr_elem(struct attr_stack *e)
 }
 
 static const char *builtin_attr[] = {
-       "[attr]binary -diff -crlf",
+       "[attr]binary -diff -text",
        NULL,
 };