Replies: 1 comment
-
Currently, |
Beta Was this translation helpful? Give feedback.
0 replies
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
-
https://difftastic.wilfred.me.uk/git.html
For viewing syntax-aware diffs and merge conflicts.
Edit:
Found https://mergiraf.org/ which does syntax-aware conflicts merging.
Beta Was this translation helpful? Give feedback.
All reactions