attr: Update definition of binary macro

3e2fcfee · Laurence McGlashan · Patrick Steinhardt · bb173381 · 3e2fcfee
Commit 3e2fcfee authored Dec 12, 2019 by Laurence McGlashan Committed by Patrick Steinhardt Mar 26, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

src/attrcache.c
+1 -1

No files found.
--- a/src/attrcache.c
+++ b/src/attrcache.c
@@ -413,7 +413,7 @@ int git_attr_cache__init(git_repository *repo)
 	git_config_free(cfg);

 	/* insert default macros */
-	return git_attr_add_macro(repo, "binary", "-diff -crlf -text");
+	return git_attr_add_macro(repo, "binary", "-diff -merge -text -crlf");

 cancel:
 	attr_cache__free(cache);