Corrects typo on logicalcherry-pick conflict message. Change-Id: Ic04b0b8712ac424a1aeaa73c048a792edf74bcc4
This is a temporary repository holding the work on the EMF Compare command line application. This application aims to handle EMF model on git repository from a command line tool. This repository will soon migrate to the eclipse foundation.