mergetools / gvimdiffon commit config: add conditional include (3efd0be)
   1. "$MERGE_TOOLS_DIR/vimdiff"