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
Showing
想要评论请 注册 或 登录