mergetools / gvimdiffon commit Merge branch 'mh/packed-ref-store-prep' (711a11c)
   1. "$MERGE_TOOLS_DIR/vimdiff"