projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9f30855) | patch
git-merge-file: refuse to merge binary files
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Tue, 5 Jun 2007 02:37:13 +0000 (03:37 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 5 Jun 2007 06:10:29 +0000 (23:10 -0700)
commit5771907a5745799c559ff21ccfcabfd21cc23b36
tree47427699ad65ca3a9bd1b5192e53490fc5166623tree | snapshot
parent9f30855d0ff5206e85e45f0307be9d18ffda41d3commit | diff
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>
builtin-merge-file.c diff | blob | blame | history
t/t6023-merge-file.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.