-
For certain values of arrays, the diff3_merge module fails to merge them correctly, even when there is no conflict.
Here's an example where issues occur:
a = ["n4100522632", "n4100697091", "n4100697…
-
### Go version
gc-tip (should reproduce with all versions)
### Output of `go env` in your module/workspace:
```shell
N/A
```
### What did you do?
Running the inline analyzer on a package where i…
-
Currently uutils' diffutils only implements the `diff` executable.
But GNU's diffutils also provide `cmp`, `diff3` and `sdiff`.
This issue is a tracker for the implementation of the `cmp` utilit…
-
## Description
This improves interop with tools that only understand Git-style conflict markers, e.g. IDEs, `npm`.
We would probably make a config option for this, but it might also be nice to h…
-
Teammates told me they can't check out my unapproved stacked diffs. Say I have stacked diffs: diff1 -> diff2 -> diff3 -> diff4, and none of them are approved yet. What's the best way someone can check…
-
VS Code allows to easily compare two files by choosing `Select for compare` and `Compare with selected`.
But we can only select two files.
`diff3`, `kdiff3` and `vimdiff` do the job but I would …
-
Currently, when we have a conflict we have the option to compare changes. this will simply compare HEAD with the Incoming Change. Using diff3 as a conflict style you will also have the abi…
-
I'm getting the following error when trying to clone a github repository
```
Failed to clone into '/tmp/foo/bar.git' - unknown style 'zdiff3' given for 'merge.conflictstyle'
```
It's ok to me …
-
https://github.com/Axosoft/diff3/blob/cd8d7618bb1505b65f70fea7d260344cc99ace38/onp.js#L114
I think this line could be removed
-
Hi! Thanks for the great library.
Was wondering if there was any meaningful way to "merge" two `[Diff a]`'s into a `[Hunk a]`, such that:
```
xs, ys, zs :: [A]
xsys, xszs :: [Diff A]
xsys …