mergetools / gvimdiff2on commit git-p4: fix small bug in locked test scripts (2cce675)
   1. "$MERGE_TOOLS_DIR/vimdiff"