mergetools / gvimdiff3on commit resolve_ref_unsafe(): ensure flags is always set (a70a93b)
   1. "$MERGE_TOOLS_DIR/vimdiff"