mergetools / gvimdiff3on commit checkout: do not fail if target is an empty directory (ee4fb84)
   1. "$MERGE_TOOLS_DIR/vimdiff"