
* stable-2.16: Strip trailing slash at the end when creating repos Add support for cherry-picking even with merge conflicts Change-Id: I1656c751d3ac3ef6de27085b6d004249923e75d4
* stable-2.16: Strip trailing slash at the end when creating repos Add support for cherry-picking even with merge conflicts Change-Id: I1656c751d3ac3ef6de27085b6d004249923e75d4