[1.8.x] Added isort config to ease resolving merge conflicts.

setup.cfg

@@ -7,6 +7,13 @@ exclude=build,.git,./django/utils/dictconfig.py,./django/utils/unittest.py,./dja
 ignore=E123,E128,E501,W601
 max-line-length = 119
 
+[isort]
+combine_as_imports = true
+default_section = THIRDPARTY
+include_trailing_comma = true
+known_first_party = django
+multi_line_output = 5
+
 [metadata]
 license-file = LICENSE