-
Does this "merge driver" work with [git mergetool](https://git-scm.com/docs/git-mergetool)? It seems the parameters `git mergetool` passes are different than `%O %A %B`.
-
Using nbdime 1.0.7
Seems related to issue #404
When I try to download or close the tool I get the warning "There are conflicts remaining. Do you still want to download the merge output?."
Pressin…
-
### If the feature request is for a plugin or theme, specify it here.
oh-my-zsh git shortcuts
### If the feature solves a problem you have, specify it here.
_No response_
### Describe the …
-
## Steps to reproduce
1. Install git mergetool
2. Click start git mergetool from the git panel
3.
4.
## Expected behavior
Open merge tool without error message
## [Optional] screensh…
Obehi updated
2 years ago
-
![image](https://user-images.githubusercontent.com/22229700/141649922-a300e5c2-1b29-46f0-b65e-79f324deb7df.png)
when i try it, i can not do it right.My git repo is so simple.By the way , your extensi…
-
-
On the website: https://yousseb.github.io/meld/ we have this .gitconfig example:
```
[diff]
tool = meld
[difftool]
prompt = false
[difftool "meld"]
trustExitCode = true
cmd = open -W -…
-
Issue Type: Feature Request
I'm using VS code on a windows local machine and connected to a remote linux machine. Both machines have git installed and my windows machine's git is setup to use beyo…
-
Accroding https://www.grzegorowski.com/using-vim-or-neovim-nvim-as-a-git-mergetool,
vim can use `vim-fugitive` as git mergetool by following git config.
How to use gina like this?
```
# define com…
-
When git does not find a `merge.tool` config entry, it attempts to run the first "mergetool" it finds, from a list of pre-defined tools:
> This message is displayed because 'merge.tool' is not config…