Correct cdiff path and git diff width