diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-06-05 03:37:13 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-04 23:10:29 -0700 |
| commit | 5771907a5745799c559ff21ccfcabfd21cc23b36 (patch) | |
| tree | 47427699ad65ca3a9bd1b5192e53490fc5166623 /t/t6023-merge-file.sh | |
| parent | 9f30855d0ff5206e85e45f0307be9d18ffda41d3 (diff) | |
| download | git-5771907a5745799c559ff21ccfcabfd21cc23b36.tar.gz git-5771907a5745799c559ff21ccfcabfd21cc23b36.tar.xz | |
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-x | t/t6023-merge-file.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh index c76fccfb5..1decbfba6 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 |