Results 1 to 2 of 2
  1. #1
    Join Date
    Mar 2016
    Posts
    1

    Default Unable to do a 3-way merge using BC4 on windows for git

    I am unable to do a 3 way merge on windows for git files (I was able to do it earlier on BC3 trial version). I now have a BC4 (Version 4.1.3) 64 bit version on my machine. I am running it on Windows 7 and the git version is - git version 2.7.1.windows.1

    When I type in git mergetool for conflicted files, earlier (with BC3 trial version) it used to show me 3-way merge along with the merged view. Now it just shows a diff between the remote and local file (2-way merge).

    Following is the relevant section of my .gitconfig

    [diff]
    tool = bc3
    [difftool "bc3"]
    cmd = \"c:/program files/beyond compare 4/bcomp.exe\" \"$LOCAL\" \"$REMOTE\"
    [merge]
    tool = bc3
    [mergetool]
    prompt = false
    [mergetool "bc3"]
    cmd = \"c:/program files/beyond compare 4/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
    trustExitCode = true

    I have also tried the same config with "bc4" instead of "bc3", but with no success. Can you please let me know what the correct config is?

    Thanks,
    Harsha

  2. #2
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    11,609

    Default

    Hello,

    You will want to follow the directions listed here:
    http://www.scootersoftware.com/suppo...vcs#gitwindows

    The key factor being that Git still recognizes the keyword "bc3" even for BC4 installations. Hopefully this will be updated to a more general "bc" in a future release.
    Aaron P Scooter Software

Tags for this Thread

Posting Permissions

  • You may not post new threads
  • You may not post replies
  • You may not post attachments
  • You may not edit your posts
  •