Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

git difftool not working with files #15

Open
rss81 opened this issue Feb 19, 2018 · 2 comments
Open

git difftool not working with files #15

rss81 opened this issue Feb 19, 2018 · 2 comments

Comments

@rss81
Copy link

rss81 commented Feb 19, 2018

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!'

 -0:00.0 bug-report:open (div.package-detail.panels-item)

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

@felixkiss
Copy link
Owner

felixkiss commented Mar 1, 2018

  1. Does the following command, executed from your working directory, open the difftool correctly?
git difftool --gui --no-prompt some/example.file
  1. 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)

@hurryup84
Copy link

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants