Merge branch 'stable-1.2'

* stable-1.2:
  Fix version.sh
  Throw API exception when MergeCommand hits checkout conflicts
  Add methods for configuring platform emulation
  Fix history rendering not to occupy too many lanes
  Fix History rendering

Change-Id: If71cc760423ae2b76c7435ca4830edc1745556de
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/tools/version.sh b/tools/version.sh
index 2fae5e1427..eaff9a61d8 100755
--- a/tools/version.sh
+++ b/tools/version.sh
@@ -141,7 +141,7 @@ perl -pi~ -e '
 		$seen_version = 0;
 		$old_argv = $ARGV;
 	}
-	if ($seen_version < 6) {
+	if ($seen_version < 5) {
 		$seen_version++ if
 		s{<(version)>.*</\1>}{<${1}>'"$POM_V"'</${1}>};
 	}