mergetools / gvimdiffon commit Merge branch 'jc/fsck-dropped-errors' (30ce3b3)
   1. "$MERGE_TOOLS_DIR/vimdiff"