projects
/
idea
/
community.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6abc027
6805a55
)
Merge branch 'master' into vplyashkun/clang_tidy_multifile_fixes
author
Vladimir Plyashkun
<vladimir.plyashkun@jetbrains.com>
Tue, 11 Sep 2018 13:03:22 +0000
(16:03 +0300)
committer
Vladimir Plyashkun
<vladimir.plyashkun@jetbrains.com>
Tue, 11 Sep 2018 13:03:22 +0000
(16:03 +0300)
# Conflicts:
# platform/analysis-impl/src/com/intellij/codeInspection/ExternalAnnotatorInspectionVisitor.java
1
2
platform/analysis-impl/src/com/intellij/codeInspection/ExternalAnnotatorInspectionVisitor.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
platform/analysis-impl/src/com/intellij/codeInspection/ExternalAnnotatorInspectionVisitor.java
Simple merge