diff: fix 2-way diff panes not being shown side by side eee7674cef41 had the side effect of setting overflow styling on the DOM elements used by mergely. That confused it's computation of sizes on some browsers, scroll bars got added, and the panes were re-flowed to not be side-by-side. To fix that, add an exception that allow overflow-x to be set to visible.

babel >= 0.9.6, < 2.4
waitress >= 0.8.8, < 1.0
pytest ~= 3.0, >= 3.3.0
pytest-runner
pytest-sugar>=0.7.0
pytest-benchmark
pytest-localserver
mock
sphinx
webtest < 3