User-visible changes: - fix bogus "branch on server has different ancestry" errors from 'got send' - do not try to merge binary files during (un)stage -p and revert -p
