David Pursehouse 4b4712c046 Merge branch 'stable-2.16'
* stable-2.16:
  Strip trailing slash at the end when creating repos
  Add support for cherry-picking even with merge conflicts

Change-Id: I1656c751d3ac3ef6de27085b6d004249923e75d4
2019-03-09 17:13:56 +09:00
..
2018-12-21 13:54:37 -08:00
2018-11-13 15:06:26 -08:00
2018-08-14 08:07:59 +02:00