haaorlando.blogg.se

Path = 'c:/Program Files/Beyond Compare 4/bcomp.exe'Ĭmd = 'c:/Program files/Beyond Compare 4/bcomp.exe' "$LOCAL" "$REMOTE" "$BASE" "$MERGED"

gitconfig is anycodings_merge-conflict-resolution The version of git is git anycodings_merge-conflict-resolution version 2.7.1.windows.1 and I am on Windows anycodings_merge-conflict-resolution 7. The version of Beyond Compare is Version anycodings_merge-conflict-resolution 4.1.3 (64-bit). It opens a beyond compare tab but instead of anycodings_merge-conflict-resolution a 3-way merge its a normal diff view. When anycodings_merge-conflict-resolution there are conflicts I type git mergetool I am unable to do a 3-way merge with beyond anycodings_merge-conflict-resolution compare 4 to resolve any git conflicts.