# HG changeset patch
# User Vadim Gelfer <vadim.gelfer@gmail.com>
# Date 1142062476 28800
# Node ID 4e44ca05a86667447c55f6886fae562101d96b1e
# Parent  b98160cfb2f3901bf6e133bb9e112aaf49bd4a66# Parent  4392ccefe4321d1d061a9f9f9b6f399818462cdd
merge with self.


diff --git a/hgmerge b/hgmerge