mergetools / vimdiff3on commit builtin-am: handle stray state directory (6d42ac2)
   1. "$MERGE_TOOLS_DIR/vimdiff"