diff mercurial/merge.py @ 27834:476f53058ee8

with: use context manager for wlock in shelve createcmd
author Bryan O'Sullivan <bryano@fb.com>
date Fri, 15 Jan 2016 13:14:47 -0800
parents 6b639caa1652
children a33c1c9e769c
line wrap: on
line diff