# HG changeset patch
# User Kevin Bullock <kbullock@ringworld.org>
# Date 1360448758 0
# Node ID 43ffd0279876a0ee3b1a91d9351bd32c061ccd1f
# Parent  e7b89b5127c2607bcaedf7c2fb0ea525df526ea6# Parent  227479f61db9d169c1afea6fa0a9dce7288d4932
merge with stable

diff -r e7b89b5127c2 -r 43ffd0279876 mercurial/scmutil.py
diff -r e7b89b5127c2 -r 43ffd0279876 tests/test-obsolete.t