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