tag | 53ed7c685349b7c472dfd27f831179a31e24a167 | |
---|---|---|
tagger | Laurent Goubet <laurent.goubet@obeo.fr> | Fri Nov 06 10:11:06 2015 +0100 |
object | 0f040eee6a5e1cffe8df67f27683301a3f9424ba |
EMF Compare 3.2.0M3 - Neon M3 - 201511010417
commit | 0f040eee6a5e1cffe8df67f27683301a3f9424ba | [log] [tgz] |
---|---|---|
author | Axel Richard <axel.richard@obeo.fr> | Wed Oct 28 09:46:13 2015 +0100 |
committer | Axel Richard <axel.richard@obeo.fr> | Wed Oct 28 09:54:55 2015 +0100 |
tree | 295c89c0fd9fa7414cd20fcb6caafcdd172917f7 | |
parent | b255a78f89d5bf5f7a259425e6b7d2903cedd1e0 [diff] |
Revert "[462863] Staging Prompt after Resolving Conflicts" This reverts commit 556185832c07ba3c740611346d0829b32e3f7f17. Change-Id: I06df2e1a1c60842443f4ec0e7c7f423087708f53 Signed-off-by: Axel Richard <axel.richard@obeo.fr>