merge and resolve: Output short hashes and .. in "Updating ..."