mergetools / vimdiff3on commit commit: check result of resolve_ref_unsafe (c26de08)
   1. "$MERGE_TOOLS_DIR/vimdiff"