I am trying to use BC to compare to two git commit, but files are not aligned in the comparison view, e.g. there is a file main.cpp on the left and on the right, but they appear on different lines. The file on the right looks like a link and when I open it, I only get the filename again.
I am calling BC with:
My .gitconfig looks like this (taken from https://www.scootersoftware.com/vbul...ontrol-Systems , second post by Aaron) :
I am calling BC with:
Code:
git difftool --dir-diff HEAD~3
Code:
[diff] tool = bcomp [difftool] prompt = false [difftool "bcomp"] trustExitCode = true cmd = "/usr/local/bin/bcomp" "$LOCAL" "$REMOTE" [merge] tool = bcomp [mergetool] prompt = false [mergetool "bcomp"] trustExitCode = true cmd = "/usr/local/bin/bcomp" "$LOCAL" "$REMOTE" "$BASE" "$MERGED"
Comment