# HG changeset patch
# User Vadim Gelfer <vadim.gelfer@gmail.com>
# Date 1155750762 25200
# Node ID 773c5b82d052b4a9b439369a3dbb5f8dedd7159a
# Parent  addb58e3b41c5880b77f29d28e1671d5d5c1883d# Parent  ef8ee4477019da03a39add4be5a471b3b7263600
override previous merge with mpm.
merge at ef8ee4477019 was bad.

diff -r addb58e3b41c -r 773c5b82d052 hgext/mq.py
diff -r addb58e3b41c -r 773c5b82d052 mercurial/commands.py
diff -r addb58e3b41c -r 773c5b82d052 mercurial/patch.py