-
```
Required information!
OS version: Win2k/WinXP/Vista/Win7/Win8 SP? x86/x64
ConEmu version: 130726 x64
*Bug description*
I was using git mergetool with vimdiff. I exited vim with an x! and the…
-
```
Required information!
OS version: Win2k/WinXP/Vista/Win7/Win8 SP? x86/x64
ConEmu version: 130726 x64
*Bug description*
I was using git mergetool with vimdiff. I exited vim with an x! and the…
-
**Problem description**
There is no diff/merge tool with proper syntax highlighting like SublimeMerge, but it can only works in a git environment. There is a lot of non-git cases where diff/merge i…
-
Originally reported on Google Code with ID 1173
```
Required information!
OS version: Win2k/WinXP/Vista/Win7/Win8 SP? x86/x64
ConEmu version: 130726 x64
*Bug description*
I was using git mergeto…
-
Git applies `$XDG_CONFIG_HOME/git/config`, followed by `$HOME/.gitconfig`.
Currently it does not find `.gitconfig` at all, and even if it does, it can get clobbered by remote `$HOME`, which may or …
-
After creating a new Compare under `Search and Compare` and launching a diff view, which shows two windows in parallel, it would be useful to have some way of identifying the windows.
I feel that …
cefn updated
9 months ago
-
**Version info**
- OS: macOS 13,5
- Build: 2091
**Description**
Previously `smerge .` would open the repository but now it presents me with a Open Dialog.
**Steps to reproduce**
Step…
-
In my scenario `base_url` is used when running nbmergetool under `git mergetool`, and [jupyterlab server proxy](https://github.com/jupyterhub/jupyter-server-proxy) is used as a proxy.
nbmerge_con…
-
I am prompted with below error when trying to "open in merge tool"
```
The diff tool nvimdiff is not available as 'nvim'
fatal: external diff died, stopping at
```
I have set difftool and me…
-
Thank you for responding @chrmarti, I appreciate you discussing this even if you didn't necessarily agree with it.
I really appreciate the tip regarding `devcontainer.json`. That is non-obvious but…