-
`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_…
-
It would be nice if `diffr` could support diff3 as generated by git during merges.
Currently it simply ignores changes from on side.
-
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…
-
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:
…
-
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…
-
```
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())
…
-
Git offers the `diff3` conflict style, where conflicts show not only the left and right branch, but also the base version:
```
> theirs
```
I always use this style because it makes it much easier …
-
### Is there an existing issue for this?
- [X] I have searched the existing issues
### This issue exists in the latest npm version
- [X] I am using the latest npm
### Current Behavior
W…
-
I don't know how feasible is that. To change the comments of the conflict markers. But diff3 conflictstyle is another must use next to imerge to handle as much conflicts as possible and reliably.
T…