![]() When I look at line 17 of the file referenced in the error, this is what's there: ( eval $merge_tool_cmd ) I don't know how to interpret the error what command is not found? difftool? I'm running 1.7.11 in git, and difftool is supposedly included with git starting with version 1.6.3. It continues for all of the files that are different between the commits, but it never launches DiffMerge. ![]() Viewing: 'js/pizzahut/site/browser_version.js' Viewing: 'js/angular/localization/StoreListCtrl.js' If I do git difftool HEAD~ 67b8679, leaving off the file I want, I get this: Viewing: 'js/angular/hutlovers/hutlovers.js'Ĭ:\Program Files (x86)\Git/libexec/git-core/mergetools/defaults: line 17: git-diff-diffmerge-wrapper.sh: command not found So I go to git bash and do git difftool HEAD~ 67b8679 - js/site/pizzabuilder.js and hit enter. I added this to the end of my file is that OK? ) Ĭmd = git-diff-diffmerge-wrapper.sh "$LOCAL" "$REMOTE" gitconfig file to include the diff and difftool chunks (I copied the lines directly from the post, and he does leave in the commented-out #external line. (Yes, it's the correct path for DiffMerge.) "C:\Program Files\SourceGear\Common\DiffMerge\sgdm.exe" "$1" "$2" | cat I've added the git\cmd directory to my PATH system variable and put my git-diff-diffmerge-wrapper.sh file in there: #!/bin/sh I've been following the directions in the " blog entry by Dave" link in this answer as I'm on Windows 7 and do use SourceGear's DiffMerge tool.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |