mergetools / gvimdiffon commit Merge branch 'jk/config-include' (895f20d)
   1. "$MERGE_TOOLS_DIR/vimdiff"