-
The .gitconfig in https://github.com/yousseb/meld/blob/0c2902e367bb1f9d69948b2e01076416418e11f6/index.html#L63-L80
did not work for me in macOS Monterrey 12.3.1.
The bug that I'm seeing with the …
-
Hi, all. We're having a project with four people working on the same notebook, and use nbdime extensively. Every now and then, the mergetool just doesn't work. The page hangs in its loading state: The…
-
i.e. https://medium.com/faun/using-vscode-as-git-mergetool-and-difftool-2e241123abe7 ?
-
**Do you want to request a *feature* or report a *bug*?**
Report a bug.
**What is the current behavior?**
In the global .gitconfig I have defined several custom merge and diff tools. To distingui…
-
## Steps to reproduce
```
$ cd vscode-as-git-mergetool
$ git log -n 1 --oneline --no-decorate
de60bc0 update dependencies
$ node --version
v16.13.0
$ yarn --version
1.22.17
$ yarn
…
-
## Feature description
Git Extensions has a handy feature for verifying your GIT setup is configured properly, the only problem is that it doesn't take into account any system wide settings…
-
Hi,
I was wondering if neoforged was really supported ? I've seen this commit https://github.com/SKCraft/Launcher/commit/b5fe175650b14dac472bb84a95d15613078a84c0 but it doesn't look like it works o…
-
### The desktop app doesn't work with Beyond Compare for merge conflicts
I have the following settings in my gitconfig file.
```
[merge]
tool = BeyondCompare4
[diff]
guitool = beyondcompar…
-
**Is your feature request related to a problem? Please describe.**
Is very hard to resolve merge conflicts by hand in text editor it very error prone
**Describe the solution you'd like**
There s…
-
### Environment
- Git Extensions 4.2.1.17611
- Build b0c0b284876b63c52c77195ada82a85bfadbb083
- Git 2.47.0.windows.2
- Microsoft Windows NT 10.0.22631.0
- .NET 6.0.35
- DPI 144dpi (150% scaling)…