summaryrefslogtreecommitdiff
path: root/attr.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-08 21:28:55 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-08 21:28:55 -0700
commit155a4b712efd3d917c228d155ec57ec2c09d7ac0 (patch)
tree834dd2acfed03ef493f3ae7c64432eb1d203d071 /attr.c
parenta944af1d86e6171d68ed2a3aa67b1d68f00e1fe8 (diff)
downloadgit-155a4b712efd3d917c228d155ec57ec2c09d7ac0.tar.gz
attr: "binary" attribute should choose built-in "binary" merge driver
The built-in "binary" attribute macro expands to "-diff -text", so that textual diff is not produced, and the contents will not go through any CR/LF conversion ever. During a merge, it should also choose the "binary" low-level merge driver, but it didn't. Make it expand to "-diff -merge -text". Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'attr.c')
-rw-r--r--attr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/attr.c b/attr.c
index 303751f6c2..3f581b3cec 100644
--- a/attr.c
+++ b/attr.c
@@ -306,7 +306,7 @@ static void free_attr_elem(struct attr_stack *e)
}
static const char *builtin_attr[] = {
- "[attr]binary -diff -text",
+ "[attr]binary -diff -merge -text",
NULL,
};