-
Search for kdiff3 on windows linux try a couple depending on env (maybe bin/diff it?)
```
[diff]
tool = vimdiff3
```
-
I am currently using the old `pwsafe` CLI (from http://sf.net/projects/pwsafe) with version control and a wrapper script to maintain a shared repository of passwords with my team of sys admins. The CL…
-
Getting this error with diffutils_jll 3.10 and 3.8. 3.7, interestingly, is fine. And so are the other binaries from the diffutils_jll (`diff3`, `sdiff` and `cmp`):
```
julia> run(`$(diffutils_jll.…
-
hi,
Now that syncthing has a conflict handling system, it thought would be nice to propose some kind of semi-automatic conflict resolution. (especially on first time merge, despite i saw the temporar…
-
```
I have a program that creates reports based on the file system each night.
These files need to be archived over a long period. A typical file will
have roughly 50MB.
I have started using xdelta…
-
```
git config --global user.name "Dave Hirschfeld"
git config --global user.email "dave.hirschfeld@gmail.com"
```
```
git config --global pull.ff only
git config --global push.followTags true
…
-
### Background
The [Guiffy SureMerge whitepaper](https://www.guiffy.com/SureMergeWP.html) by Bill Ritcher (developer of Guiffy) presents a set of interesting (as it terms them) "Pathological cases"…
-
```
I have a program that creates reports based on the file system each night.
These files need to be archived over a long period. A typical file will
have roughly 50MB.
I have started using xdelta…
-
This was actually one of the first ideas I'd had for this package, and for whatever reason I never got around to doing it, or writing it down.
On each conflict marker, I want to add a "Why" button. P…
-
Hi,
I have an issue when creating diffpatches on my objects after I have modified a sub-collection on those objects. It all works fine as long as I add or remove items to the collection, but not w…