# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1323903333 -3600
# Node ID c8790bc6417af889a544de7c3eaf1cdeaaa4701e
# Parent  82654312e257fadced8f20dedd4dc593ee084ffd# Parent  4860d620ce87b6921917516fb6637b38a70f905d
hg merge

diff -r 82654312e257 -r c8790bc6417a .hgsubstate