diff options
| author | Laurence McGlashan <Laurence.McGlashan@mathworks.co.uk> | 2019-12-12 10:58:56 +0000 |
|---|---|---|
| committer | Patrick Steinhardt <ps@pks.im> | 2020-03-26 22:12:59 +0100 |
| commit | 3e2fcfee161ab369dae11fd07e884ba2a5cbeccc (patch) | |
| tree | 878a06c44b9a495484ecd5ccde5117e170359113 | |
| parent | bb173381914f5097d290bfa5b6ec5502234cfc1e (diff) | |
| download | libgit2-3e2fcfee161ab369dae11fd07e884ba2a5cbeccc.tar.gz | |
attr: Update definition of binary macro
| -rw-r--r-- | src/attrcache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/attrcache.c b/src/attrcache.c index cb8a4a4e9..9beed3bcb 100644 --- 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); |