wip: add a git-mergetool sub command #561
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
brianmcgee
force-pushed
the
feat/git-merge-tool
branch
2 times, most recently
from
b313bfc to
16ce100
Compare
Partial implementation of #523. Signed-off-by: Brian McGee <brian@bmcgee.ie>
brianmcgee
force-pushed
the
feat/git-merge-tool
branch
from
16ce100 to
30015be
Compare
|
@infinisil @MattSturgeon I've done some quick manual testing with this, I still need to add some unit tests, though. Would you mind giving it a quick smoke test: |
|
I haven't looked at the diff yet, but a couple of things perhaps worth checking:
|
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
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.
Partial implementation of #523.
Signed-off-by: Brian McGee brian@bmcgee.ie