(10/11/29 7:36), Robert Muir wrote:
In cases like this, i would recommend merging from the root of your
checkout (branch_3x/)
Otherwise when merging from individual files or directories, this adds
merge props to them (in this case
lucene/dev/branches/branch_3x/lucene/contrib/misc/).
Sorry, I'll do next time...
Koji
--
http://www.rondhuit.com/en/
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
