summaryrefslogtreecommitdiff
path: root/t/t6023-merge-file.sh
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2007-06-05 02:37:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-06-05 06:10:29 (GMT)
commit5771907a5745799c559ff21ccfcabfd21cc23b36 (patch)
tree47427699ad65ca3a9bd1b5192e53490fc5166623 /t/t6023-merge-file.sh
parent9f30855d0ff5206e85e45f0307be9d18ffda41d3 (diff)
downloadgit-5771907a5745799c559ff21ccfcabfd21cc23b36.zip
git-5771907a5745799c559ff21ccfcabfd21cc23b36.tar.gz
git-5771907a5745799c559ff21ccfcabfd21cc23b36.tar.bz2
git-merge-file: refuse to merge binary files
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6023-merge-file.sh')
-rwxr-xr-xt/t6023-merge-file.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh
index c76fccf..1decbfb 100755
--- a/t/t6023-merge-file.sh
+++ b/t/t6023-merge-file.sh
@@ -134,5 +134,10 @@ 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