mergetools / gvimdiffon commit Merge branch 'sg/fsck-config-in-doc' into maint (5e864ac)
   1. "$MERGE_TOOLS_DIR/vimdiff"