beyondcompare - Git Diff with Beyond Compare -


i have succeeded in getting git start beyond compare 3 diff tool however, when diff, file comparing against not being loaded. latest version of file loaded , nothing else, there nothing in right pane of beyond compare.

i running git 1.6.3.1 cygwin beyond compare 3. have set beyond compare suggest in support part of website script such:

#!/bin/sh   # diff called git 7 parameters:   # path old-file old-hex old-mode new-file new-hex new-mode   "path_to_bc3_executable" "$2" "$5" | cat 

has else encountered problem , know solution this?

edit:
have followed suggestions vonc still having same problem before. kinda new git perhaps not using diff correctly.

for example, trying see diff on file command such:
git diff main.css

beyond compare open , display current main.css in left pane, there nothing in right pane. see current main.css in left pane compared head, have last committed.

my git-diff-wrapper.sh looks this:

#!/bin/sh   # diff called git 7 parameters:   # path old-file old-hex old-mode new-file new-hex new-mode   "c:/program files/beyond compare 3/bcompare.exe" "$2" "$5" | cat 

my git config looks diff:

[diff]   external = c:/cygwin/bin/git-diff-wrapper.sh 

i don't use wrapper .sh files. environment windows xp, git 1.7.1 on cygwin, , beyond compare 3. following .git/config file.

[diff]     tool = bc3 [difftool]     prompt = false [difftool "bc3"]     #use cygpath transform cygwin path $local (something /tmp/u5vvp1_abc) windows path, because bc3 windows software     cmd = \"c:/program files/beyond compare 3/bcomp.exe\" "$(cygpath -w $local)" "$remote" [merge]     tool = bc3 [mergetool]     prompt = false [mergetool "bc3"]     #trustexitcode = true     cmd = \"c:/program files/beyond compare 3/bcomp.exe\" "$local" "$remote" "$base" "$merged" 

then, use $ git difftool compare , $ git mergetool merge.

about trustexitcode: custom merge command, specify whether exit code of merge command can used determine whether merge successful. if not set true merge target file timestamp checked , merge assumed have been successful if file has been updated, otherwise user prompted indicate success of merge.


Comments

Popular posts from this blog

c++ - Convert big endian to little endian when reading from a binary file -

C#: Application without a window or taskbar item (background app) that can still use Console.WriteLine() -

unicode - Are email addresses allowed to contain non-alphanumeric characters? -