-
### Version
7.0.0.202409031743-r
### Operating System
MacOS
### Bug description
1. clone [cucumber-ruby](https://github.com/cucumber/cucumber-ruby)
2. merge `b6579` into `c0aea16b`
3.…
-
I use VS Code as my mergetool and have become a fan of the diff3 conflict style (https://stackoverflow.com/questions/27417656/should-diff3-be-default-conflictstyle-on-git), since it allows me to resol…
-
It would be nice if `diffr` could support diff3 as generated by git during merges.
Currently it simply ignores changes from on side.
-
`Diff3.diffComm(a, b)` where a and b are lists of words totalling about 20,000 characters each takes about 10 seconds on my laptop. This seems to be an uncharacteristically poor performance. With some…
-
When the second string contains the word `__proto__`, the library crashes inside the LCS function.
The cause is the arbitrary strings are used to key into a JS object with a prototype, so `__proto_…
-
I have in my `.gitconfig`:
``` ini
[merge]
conflictstyle = diff3
```
And in conflicts:
![image](https://cloud.githubusercontent.com/assets/5620073/18609957/745cae04-7d17-11e6-9ca5-2b9470474073.p…
-
```
std::string base_code_ = "0";
std::string left_code_ = "100";
std::string right_code_ = "200";
dtl::Diff3 diff3(base_code_, left_code_, right_code_);
diff3.compose();
if (!diff3.merge())
…
-
# Description
Applying a patch generates a very confusing merge conflict in the situation I describe below. The merge conflict looks normal when I apply the patch with a normal `git stash apply`,…
-
Hello,
We are experiencing a really weird behaviour with the following example:
```javascript
const Diff3 = require('node-diff3');
const templateA = `
$capitalize($possessive([q#3])) Securi…
-
Somehow this project has `fetch` and `pull`, but missing `merge`?
FWIW, `pull` is a `fetch` immediately followed by `merge`, so how was the `pull` implemented in the first place?
For my case:
…