[svnbook commit] r2910 - trunk/src/en/book

[Eric Hanchrow]

Is the option "--integrate" or "--reintegrate"?

    -$ svn merge http://svn.example.com/repos/calc/branches/my-calc-branch
    +$ svn merge --reintegrate http://svn.example.com/repos/calc/branches/my-calc-branch
    ...
    +        the <option>--reintegrate</option> option this time around.
    ...
    +        the <option>--integrate</option> option, you're asking

-- 
Most people don't even know what a rootkit is, so why should they
care about it?
        -- Thomas Hesse, Sony BMG's president of global digital business