mergetools / gvimdiffon commit Merge branch 'rb/hashmap-h-compilation-fix' into next (780bc6d)
   1. "$MERGE_TOOLS_DIR/vimdiff"