Christian Halstrick 153283f05a Added Merge command to the CLI ... This merge command accepts the merge strategy as option and uses the resolve strategy as default. It expects exactly one other revision which is merged with current head. Change-Id: Ia8c188b93ade4afabe6a9ccf267faf045f359a3a Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>		2011-03-29 12:27:45 -05:00
..
services	Added Merge command to the CLI	2011-03-29 12:27:45 -05:00
MANIFEST.MF	Added Merge command to the CLI	2011-03-29 12:27:45 -05:00