Change-Id: I356f71cdef8e23a9b06cf0a4079060a116b9ed27 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>tags/v4.8.0.201705170830-rc1
/** | /** | ||||
* Move the edit region by the specified amount. | * Move the edit region by the specified amount. | ||||
* | |||||
* @param amount | * @param amount | ||||
* the region is shifted by this amount, and can be | |||||
* positive or negative. | |||||
* @since 4.7 | |||||
* the region is shifted by this amount, and can be positive or | |||||
* negative. | |||||
* @since 4.8 | |||||
*/ | */ | ||||
public final void shift(int amount) { | public final void shift(int amount) { | ||||
beginA += amount; | beginA += amount; |
return new ResolveMerger(db, inCore); | return new ResolveMerger(db, inCore); | ||||
} | } | ||||
/** | |||||
* @since 4.8 | |||||
*/ | |||||
@Override | @Override | ||||
public ThreeWayMerger newMerger(ObjectInserter inserter, Config config) { | public ThreeWayMerger newMerger(ObjectInserter inserter, Config config) { | ||||
return new ResolveMerger(inserter, config); | return new ResolveMerger(inserter, config); |
return newMerger(db); | return newMerger(db); | ||||
} | } | ||||
/** | |||||
* @since 4.8 | |||||
*/ | |||||
@Override | @Override | ||||
public ThreeWayMerger newMerger(ObjectInserter inserter, Config config) { | public ThreeWayMerger newMerger(ObjectInserter inserter, Config config) { | ||||
return new InCoreMerger(inserter); | return new InCoreMerger(inserter); |