diff mercurial/filemerge.py @ 15908:60cb4f381a78

bookmarks: backout locking change in 12dea4d998ec Repo lock only applies to data in .hg/store/
author Matt Mackall <mpm@selenic.com>
date Wed, 18 Jan 2012 14:56:52 -0600
parents e86dd8dfdea0
children 83925d3a4559 b605448eb254
line wrap: on
line diff