I replaced it with the contents of my local configuration (posted in the OP) and removed my tooling configuration from my local config.Īfter doing so, my problem went away entirely. Path = C:/Program Files/Araxis/Araxis Merge/Compare.exeĬmd = \"c:/Program Files/Araxis/Araxis Merge/Compare.exe\" -wait -merge -3 -a1 \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\" Path = c:/Program Files (x86)/KDiff3/kdiff3.exe My global configuration looked like this: I'm not sure how they got out of sync but that they were different at all was the dead giveaway.
I did a diff between the output of git config -global -l and git config -local -l and realized that I had some conflicting (and erroneous) configurations for my difftools. After some more digging, I discovered the cause. Though my research above was accurate, it did not reveal the entire story. What steps do I need to perform to correct my configuration so that I can do a directory comparison using Araxis Merge?Īfter putting this down and coming back to it some time later, I discovered the cause of my issue.
ARAXIS MERGE GROUPON HOW TO
I'm not exactly sure how the parameters actually get passed to Araxis and therefore do not know how to troubleshoot this any further. Merge enables you to compare and process different versions of text files, such as program source code, XML, and HTML files. Which is referenced from Araxis' documentation. I'm trying to use command line git on os x in conjunction with araxis merge. Path = C:/Program Files/Araxis/Araxis Merge/compare.exe The actual local repo config contains this section: What is very strange is that this exact same setup works on my other machine.īoth git config -global diff.tool and git config -local diff.tool return "araxis" as expected. Posh Git PowerShell prompt which ships with GitHub for Windows.Araxis Merge 2013 Professional Edition 2013.4296.GitHub for Windows 1.2.6.4 f054d9f (which sits on top of msysgit 1.8.4).When I run git-diffall ( ) or git difftool -dir-diff (both referenced from Henigan's SO post), I get the following error:
0 kommentar(er)
