tree ce7fdcf571a78a173539cc06660b99ca4c16d0c8
parent 6ca9843f3ebbea152969a8b795efce1d4ff15dbf
author Stefan Lay <stefan.lay@sap.com> 1274360979 +0200
committer Chris Aniszczyk <caniszczyk@gmail.com> 1274712748 -0500

Add a merge command to the jgit API

Merges the current head with one other commit.
In this first iteration the merge command supports
only fast forward and already up-to-date.

Change-Id: I0db480f061e01b343570cf7da02cac13a0cbdf8f
Signed-off-by: Stefan Lay <stefan.lay@sap.com>
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>