mergetools / vimdiff2on commit Merge branch 'jt/fsck-code-cleanup' (52b7ab3)
   1. "$MERGE_TOOLS_DIR/vimdiff"