Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
use external merge component #222
use external merge component #222
Changes from all commits
812b897
7bf8a9a
965f516
59e482e
2bc2f22
c694fb2
9782ccf
9db2ee1
8f67f78
21b90b3
cb279e7
c4d6935
d5892a9
78543f7
8d90a87
b763e24
55ed651
8703424
1d65105
3d587b0
7194135
02df681
13bca22
f6f7c36
6eb476f
bec97f6
aacf27e
00a9a68
62252d6
7a81f3a
4b8c854
6cad59c
e5e392b
File filter
Filter by extension
Conversations
Jump to
There are no files selected for viewing
Large diffs are not rendered by default.
This file was deleted.