diff mercurial/merge.py @ 35103:7ea56f5700b8

setup: add hgext.lfs to list of Python packages This is needed for lfs to get installed. Probably could stand to go into an earlier patch, but I just want to get this stuff pushed.
author Augie Fackler <augie@google.com>
date Mon, 20 Nov 2017 18:00:02 -0500
parents 37450a122128
children b85962350bb3
line wrap: on
line diff