mergetools / vimdiff2on commit Merge branch 'jc/lock-report-on-error' (95713ff)
   1. "$MERGE_TOOLS_DIR/vimdiff"