merge tools: fix typo in Beyond Compare's 3 command line
Fix a typo error preventing 'base' to be displayed properly.
Added signature for changeset
02981000012e
Added tag 1.2.1 for changeset
02981000012e
demandimport: blacklist pythoncom
win32com.shell would segfault at import time if pythoncom
was demand loaded.
Fix for merge changes introduced in rev
9fe7e6acf525