![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 9 Jun 2007 09:06:01 +0000 (02:06 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 9 Jun 2007 09:06:01 +0000 (02:06 -0700) | ||
| commit | 89dd19e107455ee680b4d0e027998f0608840fe8 | |
| tree | 16aaba6aab254516118ece37054fca38ad5d1dee | tree | snapshot |
| parent | 66688334375adbc469419692a16857f3cda01a21 | commit | diff |
| parent | 5771907a5745799c559ff21ccfcabfd21cc23b36 | commit | diff |
Merge branch 'js/merge'
* js/merge:
git-merge-file: refuse to merge binary files
* js/merge:
git-merge-file: refuse to merge binary files
| t/t6023-merge-file.sh | diff1 | | diff2 | | blob | history |