mergetools / gvimdiffon commit Merge branch 'ks/pack-objects-bitmap' (7f109ef)
   1. "$MERGE_TOOLS_DIR/vimdiff"