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
Hi
I think your git config and git command ( that run inside the plugin) is
incorrect, for testing, use your command line and play with git mergetool
and git difftool.
About the windows I'm not sure and also I have not any tools for testing :|
, but logically it should works.
In next week I'll push some code to support meld too.
Regards,
Amin
On May 4, 2017 20:19, "s-amasha" <notifications@github.com> wrote:
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
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
<#1>, or mute the thread
<https://github.com/notifications/unsubscribe-auth/AGkvBWfUbJbupOcfdQXJrgru8pHspbpaks5r2fNygaJpZM4NQ3V2>
.