mergetools / gvimdiff3on commit cache-tree: simplify locking logic (2954e5e)
   1. "$MERGE_TOOLS_DIR/vimdiff"