mergetools / gvimdiff3on commit refs.c: change resolve_ref_unsafe reading argument to be a flags field (7695d11)
   1. "$MERGE_TOOLS_DIR/vimdiff"