mergetools / gvimdiff3on commit Merge branch 'mh/verify-lock-error-report' (829f03e)
   1. "$MERGE_TOOLS_DIR/vimdiff"