mergetools / gvimdiffon commit Merge branch 'jk/pack-bitmap' (2c1f554)
   1. "$MERGE_TOOLS_DIR/vimdiff"