Merge branch 'jc/ll-merge-binary-ours' into maint

* 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
2012-10-17 10:26:51 -07:00
parent 19100d3f7d e0e2065f74
commit 8c4bcd34bd
5 changed files with 41 additions and 12 deletions
--- 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,
 };