Merge branch 'js/merge'

* js/merge:
git-merge-file: refuse to merge binary files

diff --cc t/t6023-merge-file.sh
index 43aa5d033d0d8877b4f252710efa4bd26ee42d30,1decbfba63298e01a757851f9954fac6c54ba494..ecc11c1a8448d7a5825e8ade7d7aaa7c43efef9f
--- 1/t/t6023-merge-file.sh
--- 2/t/t6023-merge-file.sh
+++ b/t/t6023-merge-file.sh
@@@ -134,4 -134,10 +134,9 @@@ EO
  
  test_expect_success "expected conflict markers" "git diff expect out"
  
+ test_expect_success 'binary files cannot be merged' '
+       ! git merge-file -p orig.txt ../test4012.png new1.txt 2> merge.err &&
+       grep "Cannot merge binary files" merge.err
+ '
+ 
  test_done
 -