comparison enable.sh @ 326:52c53e2d413b

stabilize: clear error message than conflict during rebase offer no hope The warning is big and ugly. It will be removed when stab handle that properly.
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Wed, 27 Jun 2012 15:10:59 +0200
parents f4a00b2d8bfb
children 616305c63510
comparison
equal deleted inserted replaced
325:43a686709ded 326:52c53e2d413b