commit | a4c87dc82b7890160021df6f69e9aaaa699d9e17 | [log] [tgz] |
---|---|---|
author | Arthur Daussy <arthur.daussy@obeo.fr> | Wed Nov 26 18:29:06 2014 +0100 |
committer | Axel RICHARD <axel.richard@obeo.fr> | Mon Dec 01 03:23:25 2014 -0500 |
tree | bd453bb8abfb7972b0aa25b5dcd6210a7d2685da | |
parent | 3f36e80d31292f81c303bbda6a163b870f6528e2 [diff] |
Logicalcherry-pick: --continue option can only be used if there is no conflict left to merge. Change-Id: I1606e2e943ddabb9413985c8475e13bdc17b6068