mergetools / gvimdiffon commit Merge branch 'jk/pack-bitmap-progress' (0ddcc9c)
   1. "$MERGE_TOOLS_DIR/vimdiff"