mergetools / gvimdiffon commit Merge branch 'rh/template-updates' (dfb78f0)
   1. "$MERGE_TOOLS_DIR/vimdiff"