IntelliJ IDEA (Potentially, also RubyMine, Webstorm, P圜harm, PhpStorm) Select "Beyond Compare" from the Merge Tool drop down.Select "Beyond Compare" from the External Diff Tool drop down.To launch a merge in Beyond Compare, use: git mergetool file.ext To launch a diff in Beyond Compare, use: git difftool file.ext.Add the following lines to $HOME/.gitconfig:Ĭmd = "/usr/local/bin/bcomp" \"$LOCAL\" \"$REMOTE\"Ĭmd = "/usr/local/bin/bcomp" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\". Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools.To launch a 3-way merge using Beyond Compare, use the command: git mergetool file.ext Older versions of Git Git config -global mergetool.bc.trustExitCode true To launch a diff using Beyond Compare, use the command: git difftool file.ext Merge Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools. Set in Preferences | General | External compare tool | Other Script. DIFFĬreate an AppleScript wrapper for use by Cornerstone:ĭo shell script "/usr/local/bin/bcomp \""
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |