-
Hey,
Sorry that I create an Issue for this, but I didn't found a better way of contact to send you some feedback and feature suggestion I would really love in your software.
I really love your s…
-
Provide a compare and merge tool to merge two versions of a repertoire
pasbi updated
8 years ago
-
Update docs for use of vimdiff. Provide docs for configuring other dfftools/mergetools:
- Using VSCode: https://stackoverflow.com/questions/44549733/
- Use IntelliJ or WebStorm: https://coderwall.…
-
where to add? probably should stick to the rules, and add it to `JGit` as a method.
```
JGit.mergetool
```
Can move the `writeConflictFiles` functions in `pull` and `merge` to `mergetool`. Need to s…
-
In short - how to get merge-confilcts to be the default conflict resolution app?
-
Hi! Thanks for this great tool!
I've tried to configure it as a Git mergetool:
```
git config --global merge.tool fac
```
However, Git ignores it and it runs `vimdiff` for me. Previously, I…
-
Add support for resolving difficult merge conflicts with an external diff/merge tool such as Meld would add power to your tool/software. It could be a prompt that the user can choose when resolving me…
-
Delta is the best terminal diff viewer I ever used. Now it would be great, if I could use it as merge tool. I know that is a huge request and I completely understand when it gets declined.
-
I have configured git with the config on https://yousseb.github.io/meld/ but when I do
_git mergetool_
meld is opened, but I have three warnings that it could not read any of the files, it is using…
-
I followed [1] and tried to use the recommendation how to set up Meld as a `git` `mergetool` in OSX.
However, the current path is missing in the `cmd`.
I was unable to find the code for the webp…