tree bd453bb8abfb7972b0aa25b5dcd6210a7d2685da
parent 3f36e80d31292f81c303bbda6a163b870f6528e2
author Arthur Daussy <arthur.daussy@obeo.fr> 1417022946 +0100
committer Axel RICHARD <axel.richard@obeo.fr> 1417422205 -0500

Logicalcherry-pick: --continue option can only be used if there is no
conflict left to merge.

Change-Id: I1606e2e943ddabb9413985c8475e13bdc17b6068