mergetools / gvimdiff3on commit checkout-index: simplify locking logic (02ae242)
   1. "$MERGE_TOOLS_DIR/vimdiff"