mergetools / gvimdiffon commit Merge branch 'mh/deref-symref-over-helper-transport' (a6c6815)
   1. "$MERGE_TOOLS_DIR/vimdiff"