commands.resolve: switch to mergestate.read()
See previous patches for why we're doing this.
#!/usr/bin/env pythonimporterrno,os,sysforfinsys.argv[1:]:try:printf,'->',os.readlink(f)exceptOSErroraserr:iferr.errno!=errno.EINVAL:raiseprintf,'not a symlink'sys.exit(0)