Lunny Xiao bf4badad1d Pull request conflict files detection (#5951)
* add conflict detection

* test pull request conflict files

* fix detection files number

* fix comments
2019-02-05 06:54:49 -05:00
..
2019-01-23 13:58:38 -05:00
2019-01-23 13:58:38 -05:00
2019-01-23 13:58:38 -05:00
2017-01-25 10:43:02 +08:00
2015-12-08 00:57:46 +01:00
2019-01-23 13:58:38 -05:00
2019-01-23 13:58:38 -05:00