SourceGear Support

I reinstalled diffmerge using msi installer (earlier used the zipped version) - the problem remains same.

When on windows, I am launching command "git mergetool", in order to resolve merge conflict, I am getting error as per attached screenshot - please help! Note: when I do "git merge" (not using DiffMerge) - things appear normal! Following is my .gitconfig file: [user] name = Bibha...

Hi Beth, Thanks a ton ! Escaping the $ did the trick! Again thanks! My Git installation folder has both git-bash.exe and git-cmd.exe and the Git installer creates a shortcut that points to git-bash.exe - yes, so I am using git-bash.exe and msysgit (not, MySysGit - probably it was your typo) Question...

If I do not get the right solution from you today, I have to stop experimenting with DiffMerge and instead switch to a different tool like p4merge

You said "If you had a return before the local and remote, then those wouldn't be picked up and set" - didn't quite understand what you meant by that. Do you mean "carriage return" when you say "return"? For me, the whole command is in a single line! Note that I have NO...

DiffMerge now works on windows.....But.....read below: Mistake I made I installed the zipped version of DiffMerge and manually added this to PATH variable: F:\Bibhash\Programs\DiffMerge_4_2_0_697_stable_x64\sgdm.exe INSTEAD of this one: F:\Bibhash\Programs\DiffMerge_4_2_0_697_stable_x64 Current Stat...

Yes I can run the DiffMerge executable (sgdm.exe) and I can do "diff" of same files that I was trying to use in GIT. Please, I need to resolve it quick...

Bibhash

OS I'm using : Windows 10 (licensed - regularly updated) 64 bit DiffMerge Version I installed for Windows : Windows zip (64bit) DiffMerge 4.2 - tried Windows Installer (64bit) also My Git installation : Full Git Installation - 64-bit Git for Windows Setup (git version 2.8.2) as available at https:/...

By "nothing working in Windows", I mean the following : STEP#1: COMMANDS I RAN ~~~~~~~~~~~~~~~~~~~ diff ----- git config --global diff.tool diffmerge git config --global difftool.diffmerge.cmd "F:/Bibhash/Programs/DiffMerge_4_2_0_697_stable_x64/sgdm.exe \"$LOCAL\" \"$RE...

Point#1 I have followed whatever the official documentation said about configuring DiffMerge for "Git for Windows (MSysGit)" - However when I am running "git difftool", the command silently returns without anything happening. NOTE: When I first installed and configured DiffMerge ...