mergetools / gvimdiffon commit Merge branch 'mh/packed-ref-transactions' into next (b926200)
   1. "$MERGE_TOOLS_DIR/vimdiff"