summaryrefslogtreecommitdiff
path: root/attr.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-14 21:39:56 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-14 21:39:56 -0700
commite6d29a4b47cf476e18658609033bdee4c42db3b8 (patch)
tree408497238b9a9f254cfcc54c7b51480bf58b5356 /attr.c
parent1b9696548b9c9110109110d546b5e779095ee1d9 (diff)
parente0e2065f74500119d5e12524992273de362acd30 (diff)
downloadgit-e6d29a4b47cf476e18658609033bdee4c42db3b8.tar.gz
Merge branch 'jc/ll-merge-binary-ours'
"git merge -Xtheirs" did not help content-level merge of binary files; it should just take their version. Also "*.jpg binary" in the attributes did not imply they should use the binary ll-merge driver. * jc/ll-merge-binary-ours: ll-merge: warn about inability to merge binary files only when we can't attr: "binary" attribute should choose built-in "binary" merge driver merge: teach -Xours/-Xtheirs to binary ll-merge driver
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 f12c83f80a..3430faf2cc 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,
};