![]() You have to give it using the cygwin format. I understand you don't want to mess with the git installation, so I suggest that you give the complete path to your wrapper. ![]() I checked that by running env | grep PATH from within git bash. It seems to me that the problem is that the path that git bash is using is not the one that Windows is using. Here are all of my difftool settings if you want to make the switch: Ĭmd = "\"c:/program files (x86)/beyond compare 3/bcomp.exe\" \"$LOCAL\" \"$REMOTE\""Ĭmd = "\"c:/program files (x86)/beyond compare 3/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"" I actually do most of my diffing on Windows nowadays with Beyond Compare 3 Pro, though sometimes I will still use DiffMerge. I'm currently using Git 2.0, but I seem to recall having set this up with either Git 1.8.x or maybe even as early as Git 1.7.x, so try it out and see if it works. Note that I'm using msysgit Bash (not sure if it will be different for Cygwin or PoshGit users): Ĭmd = C:/Program\\ Files/SourceGear/Common/DiffMerge/sgdm.exe \"$LOCAL\" \"$REMOTE\" Next you will want to add a Git completion script appropriate for your shell environment.Not sure if this well help, but this is my configuration for difftool with DiffMerge. This script can help you auto-complete branch paths and more. To set Araxis Merge as the default application for file comparison and merging: Choose User Options from the Tools menu. Simply create a ~/.git-completion.sh file at your root directory and paste in the contents of the script appropriate for your shell environment and add it to your shell startup configuration (~/.bash_profile in my case) like so:įinally, you can show what branch you're currently working on via a Git prompt script. Just like Beyond Compare, Araxis Merge supports more than just text and image files. Edit the settings for a selected file type. It also lets you compare office documents (like MS Word, Excel, Powerpoint, or ODF). It comes in standard and professional editions, and for people working on both Windows and macOS, its good to know that a single license is valid for both platforms. Select Araxis Merge from the comparison application drop-down list. For example, when working on the master branch of the Librarian project, my shell prompt looks Librarian (master)]$ Like the Git completion script, you'll want to create a ~/.git-prompt.sh file at your root directory and then add it to your shell startup configuration similar to the git-completion script.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |