mergetools / gvimdiff3on commit git_path(): be aware of file relocation in $GIT_DIR (557bd83)
   1. "$MERGE_TOOLS_DIR/vimdiff"