mergetools / gvimdiffon commit Merge branch 'mh/avoid-rewriting-packed-refs' (ffb0b57)
   1. "$MERGE_TOOLS_DIR/vimdiff"