summaryrefslogtreecommitdiff
path: root/t/t6023-merge-file.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-06-09 09:06:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-06-09 09:06:01 (GMT)
commit89dd19e107455ee680b4d0e027998f0608840fe8 (patch)
tree16aaba6aab254516118ece37054fca38ad5d1dee /t/t6023-merge-file.sh
parent66688334375adbc469419692a16857f3cda01a21 (diff)
parent5771907a5745799c559ff21ccfcabfd21cc23b36 (diff)
downloadgit-89dd19e107455ee680b4d0e027998f0608840fe8.zip
git-89dd19e107455ee680b4d0e027998f0608840fe8.tar.gz
git-89dd19e107455ee680b4d0e027998f0608840fe8.tar.bz2
Merge branch 'js/merge'
* js/merge: git-merge-file: refuse to merge binary files
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 43aa5d0..ecc11c1 100755
--- 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