Aghabeiki / gitdiffer

Visual Studio Code extension for running git difftool through context menu

Geek Repo:Geek Repo

Github PK Tool:Github PK Tool

GitDiffer not working with other merge tools like Meld

s-amasha opened this issue · comments

Hi,
After following the installation instructions, I right click on the file with conflict and select "Launch Difftool for.."
in the VSCode output I get :
"
fatal: Path 'file1.txt' is in the index, but not at stage 0.
Did you mean ':1:file1.txt'?
"
by the way, I'm using Meld instead of DiffMerge, so I made the proper changes to the git configs,
1.How can I be sure all these configs are working? write git mergetool in command prompt and it should open the defined meretool right ?
2.are those git config instructions works on Windows too ?

Thanks