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 /refs.c | |
| parent | merge-recursive: refuse to merge binary files (diff) | |
| download | tgif-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 'refs.c')
0 files changed, 0 insertions, 0 deletions