# HG changeset patch # User Aleksej Bobylev # Date 1405621225 -10800 # Node ID 75787a6842b8c6d588c6db4aba522baa97e661bf # Parent 952382c025ded1137f603c4c02015a4236bd4abe# Parent 371ffcd4f10c06169a54d68551c7d99883d1ef09 thermald: "hg resolve --all; hg resolve --mark; hg merge" and company...