Merged.
-Original Message-
From: Leif Lindholm
Sent: Thursday, July 2, 2020 11:40 PM
To: devel@edk2.groups.io
Cc: Feng, Bob C ; Gao, Liming
Subject: [PATCH 0/2] BaseTools: minor PatchCheck.py fixes/changes
1: https://github.com/tianocore/edk2/pull/549 failed to merge, since
PatchChe
1: https://github.com/tianocore/edk2/pull/549 failed to merge, since
PatchCheck.py reports an error. Add BaseTools/Conf/diff.order to
the same exception clause currently used for .gitmodules to permit
the merge to progress.
2: On Debian 10, PatchCheck.py fails to run with the system defau
