Merkel has washed her hands of Greece, pointing out that the German government won't decide if the Greek reforms (anyone seen the new list that was promised by the way?) are up to snuff and noting that Germany will not offer any extra liquidity on its own.
Tsipras has therefore walked away empty handed, and Greece's fate continues to rest on the Troika and Greece agreeing terms (only if the Troika signs off on Greece's yet to be drafted revised reform list).
For absolute clarity:
NOTHING HAS CHANGED!
However, a lot of time has been wasted and the clock is ticking. Greece will very soon run out of money.