mergetools / gvimdiff3on commit Merge branch 'jc/reopen-lock-file' (c518279)
   1. "$MERGE_TOOLS_DIR/vimdiff"