fix: update parsing logic to identify the new note conflict marker
#14
Conversation
This file contains hidden or 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
Contributor
Author
|
Let me know if you want to update/add new test cases as part of this change. |
Upstream commit: jj-vcs/jj@242e2f8 Release notes: https://github.com/jj-vcs/jj/blob/fa7df5edb3f89ce32a03165527878de9df4bd0a4/CHANGELOG.md?plain=1#L97-L98 > The `diff` conflict marker style can now use `\\\\\\\` markers to indicate > the continuation of a conflict label from the previous line. This commit updates the script to move the diff's start point by one line if this marker is seen. Tests, ``` ❯ MINI_NVIM_PATH=/Users/prayagmatic/dev/mini.nvim make test ─╯ Total number of cases: 27 Total number of groups: 2 tests/test_internal.lua: oooooooooooooooo tests/test_jj_diffconflicts.lua: ooooooooooo Fails (0) and Notes (0) ``` Resolves rafikdraoui#13 Signed-off-by: PrayagS <prayagsavsani@gmail.com>
PrayagS
force-pushed
the
fix-for-jj-v0_37_0
branch
from
9d91b85 to
af5b345
Compare
Owner
|
Thanks for the PR! I pushed an additional commit that adds a test case for handling the new-style markers. I'll probably merge it this weekend when I get some free time. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Upstream commit: jj-vcs/jj@242e2f8
Release notes: https://github.com/jj-vcs/jj/blob/fa7df5edb3f89ce32a03165527878de9df4bd0a4/CHANGELOG.md?plain=1#L97-L98
This commit updates the script to move the diff's start point by one
line if this marker is seen.
Tests,
Resolves #13
Signed-off-by: PrayagS prayagsavsani@gmail.com