From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 9 Jun 2007 09:06:01 +0000 (-0700)
Subject: Merge branch 'js/merge'
X-Git-Tag: v1.5.3-rc0~135
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=89dd19e107455ee680b4d0e027998f0608840fe8;p=git.git

Merge branch 'js/merge'

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

89dd19e107455ee680b4d0e027998f0608840fe8
diff --cc t/t6023-merge-file.sh
index 43aa5d033,1decbfba6..ecc11c1a8
--- a/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
 -