When merging with pre-commit hooks enabled the pre-commit complains about trailing whitespaces in test/hotspot/gtest/x86/x86-asmtest.py.

The work around is to disable the pre-commit hooks before commiting the merge and re-enable them after.

Unless these trailing whitespaces are significant/required by the test, it could be good to clean them up.

test/hotspot/gtest/x86/x86-asmtest.py:172: trailing whitespace.
+
test/hotspot/gtest/x86/x86-asmtest.py:175: trailing whitespace.
+
test/hotspot/gtest/x86/x86-asmtest.py:304: trailing whitespace.
+
test/hotspot/gtest/x86/x86-asmtest.py:307: trailing whitespace.
+
test/hotspot/gtest/x86/x86-asmtest.py:319: trailing whitespace.
+
test/hotspot/gtest/x86/x86-asmtest.py:322: trailing whitespace.
+
test/hotspot/gtest/x86/x86-asmtest.py:671: trailing whitespace.
+
test/hotspot/gtest/x86/x86-asmtest.py:931: trailing whitespace.
+ ('eincl', 'inc', 32, True),
test/hotspot/gtest/x86/x86-asmtest.py:1352: trailing whitespace.
+ ('esubq_imm32', 'sub', 64, False),
test/hotspot/gtest/x86/x86-asmtest.py:1353: trailing whitespace.
+ ('esubq_imm32', 'sub', 64, True),