You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Expected: ctrl-alt-d on file should open the difftool on that file. NOTE: ctrl-shift-D does open difftool on project
Actual: nothing happens
using winmerge. also, need to add the following to keymap.cson to get ctrl-shft-D to work:
'atom-workspace atom-text-editor:not([mini])':
'ctrl-shift-D': 'unset!'
Versions
Atom: 1.24.0
Atom-Shell:
OS: Microsoft Windows 10 Pro
Misc
apm 1.18.12
npm 3.10.10
node 6.9.5 x64
atom 1.24.0
python
git 2.16.1.windows.4
visual studio
The text was updated successfully, but these errors were encountered:
Does the following command, executed from your working directory, open the difftool correctly?
git difftool --gui --no-prompt some/example.file
Does it open the file in your diftool correctly if you choose Git Difftool: Diff file from the command palette? (I believe it only opens for files that have changes not staged for commit, so make sure to test it with a appropriate file)
I have the same problem as described above.
Open on projects work fine, but not for files.
The command you proposed works fine in my git-bash
When typing the command in the the Atom Command line there is also no reaction.
Using
Atom 1.24.1 x64,
Git 2.16.2.windows.1
Windows 10 Pro
git difftool not working correctly
Expected: ctrl-alt-d on file should open the difftool on that file. NOTE: ctrl-shift-D does open difftool on project
Actual: nothing happens
using winmerge. also, need to add the following to keymap.cson to get ctrl-shft-D to work:
'atom-workspace atom-text-editor:not([mini])':
'ctrl-shift-D': 'unset!'
Versions
Atom: 1.24.0
Atom-Shell:
OS: Microsoft Windows 10 Pro
Misc
apm 1.18.12
npm 3.10.10
node 6.9.5 x64
atom 1.24.0
python
git 2.16.1.windows.4
visual studio
The text was updated successfully, but these errors were encountered: