mergetools / gvimdiffon commit Merge branch 'ab/fsck-skiplist' (66ec237)
   1. "$MERGE_TOOLS_DIR/vimdiff"