Merge branch 'js/merge'

* js/merge: git-merge-file: refuse to merge binary files
2007-06-09 02:06:01 -07:00
parent 6668833437 5771907a57
commit 89dd19e107
2 changed files with 10 additions and 1 deletions
--- a/t/t6023-merge-file.sh
+++ b/t/t6023-merge-file.sh
@ -134,4 +134,9 @@ EOF

 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