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