From: Junio C Hamano Date: Sat, 15 Sep 2012 04:39:56 +0000 (-0700) Subject: Merge branch 'jc/ll-merge-binary-ours' X-Git-Tag: v1.8.0-rc0~49 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e6d29a4b47cf476e18658609033bdee4c42db3b8?hp=e6d29a4b47cf476e18658609033bdee4c42db3b8 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 ---