# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1191968724 18000
# Node ID f9c2917a9f7a4b5f59e78e289fdc00445e6b0961
# Parent  bfbd9b9543156364df60db10511a208d3a3053e2# Parent  f9b0e4f023c4708f3aeafe83e099e3b94ab7881d
Merge with -stable

diff --git a/mercurial/merge.py b/mercurial/merge.py