mergetools / gvimdiff2on commit get_merge_bases(): always clean-up object flags (2ce406c)
   1. "$MERGE_TOOLS_DIR/vimdiff"