mergetools / gvimdiff2on commit Merge branch 'sb/object-store-replace' (174774c)
   1. "$MERGE_TOOLS_DIR/vimdiff"