Merge branch 'js/merge'
authorJunio C Hamano <gitster@pobox.com>
Sat, 9 Jun 2007 09:06:01 +0000 (02:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 9 Jun 2007 09:06:01 +0000 (02:06 -0700)
commit89dd19e107455ee680b4d0e027998f0608840fe8
tree16aaba6aab254516118ece37054fca38ad5d1dee
parent66688334375adbc469419692a16857f3cda01a21
parent5771907a5745799c559ff21ccfcabfd21cc23b36
Merge branch 'js/merge'

* js/merge:
  git-merge-file: refuse to merge binary files
t/t6023-merge-file.sh