simplemerge: rewrite flag merging loop as expression
I feel binary operations are more readable.
# name space package to host third party extensionsfrom __future__ import absolute_importimport pkgutil__path__ = pkgutil.extend_path(__path__, __name__)