Please sign in to comment.
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
- Loading branch information...
Showing with 41 additions and 12 deletions.