Console Output

+ git merge --ff appng-manager-1.17.x --strategy-option theirs
Auto-merging pom.xml
Merge made by the 'recursive' strategy.
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)