Merge branch 'stable-2.16'

Browse Source

* stable-2.16:
  Mark cherry-pick change as WIP if source change is WIP
  Mark cherry-pick change as WIP if cherry-pick resulted in conflicts

Change-Id: Ifc171cadb0437faee438662b15fe581544b5f1e5

...

This commit is contained in:

David Pursehouse

2018-10-17 15:46:15 +09:00

parent da7f2478cb f201774c93

commit cb855a4bc4

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available