Merge branch 'js/merge'
* js/merge: git-merge-file: refuse to merge binary files
Junio C Hamano committed
Jun 9, 2007 at 02:06 UTC
89dd19e107455ee680b4d0e027998f0608840fe8
No changes.
* js/merge: git-merge-file: refuse to merge binary files
No changes.