Using Beyond Compare with GitExtension

1,177 views
Skip to first unread message

Rex Pan

unread,
Jul 28, 2011, 5:23:38 AM7/28/11
to gitext...@googlegroups.com
GitExtension make suggest for the Mergetool command
"C:/Program Files/Beyond Compare 3/bcomp.exe" "$BASE" "$LOCAL" "$REMOTE"
and they take the place Left - center - right in BC

But in BC help content I found
If you include a center file BC will be able to compare both files to it and mark changes as additions, modifications, or deletions on each specific side. Changes on the left are marked in blue and changes on the right are marked in purple. Overlapping changes are considered conflicts and are marked in red.
So I think the better suggest command must be

 "C:/Program Files/Beyond Compare 3/bcomp.exe" "$LOCAL" "$BASE" "$REMOTE"

Ivan Danilov

unread,
Aug 3, 2011, 8:22:21 AM8/3/11
to gitext...@googlegroups.com
>bcomp /?
Beyond Compare v3.2.4.13298
Copyright (c) 1996-2008 Scooter Software.  All rights reserved.

Syntax:
  bcomp [options] [<Left> [<Right> [<Center> [<Output>]]]]

In other words, $BASE should be third. Honestly, I've setup Beyond compare in config file, not through the UI, and its section looks like that in ~/.gitconfig:
[difftool "beyondcompare3"]
    path = s:/BeyondCompare3/BComp.exe
    cmd = s:/BeyondCompare3/BComp.exe \"$LOCAL\" \"$REMOTE\"
[mergetool "BeyondCompare3"]
    path = s:/BeyondCompare3/BComp.exe
    cmd = s:/BeyondCompare3/BComp.exe \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
Probably you should add \" to path to BComp.exe if you have spaces in it.

Rex Pan

unread,
Aug 3, 2011, 8:28:11 AM8/3/11
to gitext...@googlegroups.com
thank you very much
 is it a bug in GitExtension? because i can't setup in the GUI, I changed but the setting is not save.

Ivan Danilov

unread,
Aug 3, 2011, 8:34:15 AM8/3/11
to gitext...@googlegroups.com
Does gitex detect your ~/.gitconfig correctly? I faced some problems
with it on windows boxes before. See here:
http://sparethought.wordpress.com/2011/06/16/troubleshooting-gitextensions-home-directory/
If it's not the case - probably you should wait for gitex's authors response.

--

Yours sincerely,


Ivan Danilov
 Senior Developer
 Tel. +380937632900

Reply all
Reply to author
Forward
0 new messages