mergetools / gvimdiffon commit Merge branch 'sg/obstack-cast-function-type-fix' (33bea73)
   1. "$MERGE_TOOLS_DIR/vimdiff"