mergetools / gvimdiff3on commit Merge branch 'js/fsck-opt' (b2f44fe)
   1. "$MERGE_TOOLS_DIR/vimdiff"