Changed git diff & merge too to source tree