diff mercurial/bookmarks.py @ 27408:2916ebaef312

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 17 Dec 2015 17:27:32 -0600
parents 38024b75241a
children 9fbae70faf65
line wrap: on
line diff