mergetools / gvimdiffon commit Merge branch 'jc/pack-bitmap-unaligned' into maint (b944d7c)
   1. "$MERGE_TOOLS_DIR/vimdiff"