On 23.01.2016, at 17:37, Eliot Miranda <eliot.miranda at gmail.com> wrote:
> 
> Any other suggestions?

“Keep mine” / “Accept incoming”

… or shorter:

“Mine” / “Incoming"

… and make the balloon help a little longer 
	“Keep the version in the image, rejecting the incoming change”
	“Accept the incoming change, replacing the version in my image” 

- Bert -



-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 4207 bytes
Desc: not available
Url : http://lists.squeakfoundation.org/pipermail/squeak-dev/attachments/20160124/a61c385f/smime.bin