diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-06-09 02:06:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-09 02:06:01 -0700 |
| commit | 89dd19e107455ee680b4d0e027998f0608840fe8 (patch) | |
| tree | 16aaba6aab254516118ece37054fca38ad5d1dee /list-objects.h | |
| parent | 66688334375adbc469419692a16857f3cda01a21 (diff) | |
| parent | 5771907a5745799c559ff21ccfcabfd21cc23b36 (diff) | |
| download | git-89dd19e107455ee680b4d0e027998f0608840fe8.tar.gz | |
Merge branch 'js/merge'
* js/merge:
git-merge-file: refuse to merge binary files
Diffstat (limited to 'list-objects.h')
0 files changed, 0 insertions, 0 deletions